diff --git a/management/client/client_test.go b/management/client/client_test.go
index 2eb5fa8a2..59e504790 100644
--- a/management/client/client_test.go
+++ b/management/client/client_test.go
@@ -259,6 +259,7 @@ func TestClient_Sync(t *testing.T) {
 	ch := make(chan *mgmtProto.SyncResponse, 5)
 
 	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
 	go func() {
 		err = client.Sync(ctx, info, func(msg *mgmtProto.SyncResponse) error {
 			ch <- msg
@@ -291,7 +292,6 @@ func TestClient_Sync(t *testing.T) {
 		t.Error("timeout waiting for test to finish")
 	}
 
-	cancel()
 }
 
 func Test_SystemMetaDataFromClient(t *testing.T) {
diff --git a/management/server/management_test.go b/management/server/management_test.go
index f7998482d..976d5dc5f 100644
--- a/management/server/management_test.go
+++ b/management/server/management_test.go
@@ -317,6 +317,7 @@ var _ = Describe("Management service", func() {
 				additionalPeers := 10
 
 				ctx, cancel := context.WithCancel(context.Background())
+				defer cancel()
 
 				var peers []wgtypes.Key
 				for i := 0; i < initialPeers; i++ {
@@ -379,7 +380,6 @@ var _ = Describe("Management service", func() {
 				}
 
 				wg.Wait()
-				cancel()
 
 				for _, syncClient := range clients {
 					err := syncClient.CloseSend()