diff --git a/events.go b/events.go
index 28d324984..f02444849 100644
--- a/events.go
+++ b/events.go
@@ -53,16 +53,14 @@ information is displayed once every 5 seconds.`,
 			events = make(chan *types.Event, 1024)
 			group  = &sync.WaitGroup{}
 		)
-		group.Add(1)
-		go func() {
-			defer group.Done()
+		group.Go(func() {
 			enc := json.NewEncoder(os.Stdout)
 			for e := range events {
 				if err := enc.Encode(e); err != nil {
 					logrus.Error(err)
 				}
 			}
-		}()
+		})
 		if context.Bool("stats") {
 			s, err := container.Stats()
 			if err != nil {
diff --git a/tests/cmd/recvtty/recvtty.go b/tests/cmd/recvtty/recvtty.go
index 135ad2290..847baab11 100644
--- a/tests/cmd/recvtty/recvtty.go
+++ b/tests/cmd/recvtty/recvtty.go
@@ -117,17 +117,13 @@ func handleSingle(path string, noStdin bool) error {
 		wg            sync.WaitGroup
 		inErr, outErr error
 	)
-	wg.Add(1)
-	go func() {
+	wg.Go(func() {
 		_, outErr = io.Copy(os.Stdout, c)
-		wg.Done()
-	}()
+	})
 	if !noStdin {
-		wg.Add(1)
-		go func() {
+		wg.Go(func() {
 			_, inErr = io.Copy(c, os.Stdin)
-			wg.Done()
-		}()
+		})
 	}
 
 	// Only close the master fd once we've stopped copying.