diff --git a/api/events.go b/api/events.go
index d0a437490c..4c92410f9a 100644
--- a/api/events.go
+++ b/api/events.go
@@ -10,6 +10,8 @@ import (
 	"github.com/docker/swarm/cluster"
 )
 
+const eventFmt string = "{%q:%q,%q:%q,%q:%q,%q:%d,%q:{%q:%q,%q:%q,%q:%q,%q:%q}}\n"
+
 // EventsHandler broadcasts events to multiple client listeners.
 type eventsHandler struct {
 	sync.RWMutex
@@ -66,7 +68,7 @@ func (eh *eventsHandler) cleanupHandler(remoteAddr string) {
 func (eh *eventsHandler) Handle(e *cluster.Event) error {
 	eh.RLock()
 
-	str := fmt.Sprintf("{%q:%q,%q:%q,%q:%q,%q:%d,%q:{%q:%q,%q:%q,%q:%q,%q:%q}}",
+	str := fmt.Sprintf(eventFmt,
 		"status", e.Status,
 		"id", e.Id,
 		"from", e.From+" node:"+e.Engine.Name,
diff --git a/api/events_test.go b/api/events_test.go
index 51dcf6effb..c7c5220298 100644
--- a/api/events_test.go
+++ b/api/events_test.go
@@ -42,7 +42,7 @@ func TestHandle(t *testing.T) {
 
 	assert.NoError(t, eh.Handle(event))
 
-	str := fmt.Sprintf("{%q:%q,%q:%q,%q:%q,%q:%d,%q:{%q:%q,%q:%q,%q:%q,%q:%q}}",
+	str := fmt.Sprintf(eventFmt,
 		"status", "status",
 		"id", "id",
 		"from", "from node:node_name",