diff --git a/management/server/management_proto_test.go b/management/server/management_proto_test.go
index 0df2462f4..8b51507bc 100644
--- a/management/server/management_proto_test.go
+++ b/management/server/management_proto_test.go
@@ -254,7 +254,7 @@ func Test_SyncProtocol(t *testing.T) {
 	}
 
 	// expired peers come separately.
-	if len(networkMap.GetOfflinePeers()) != 1 {
+	if len(networkMap.GetOfflinePeers()) != 2 {
 		t.Fatal("expecting SyncResponse to have NetworkMap with 1 offline peer")
 	}
 
diff --git a/management/server/management_suite_test.go b/management/server/management_suite_test.go
index 63084168b..cc99624a0 100644
--- a/management/server/management_suite_test.go
+++ b/management/server/management_suite_test.go
@@ -1,6 +1,13 @@
 package server_test
 
-// func TestManagement(t *testing.T) {
-// 	RegisterFailHandler(Fail)
-// 	RunSpecs(t, "Management Service Suite")
-// }
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	"testing"
+)
+
+func TestManagement(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Management Service Suite")
+}
diff --git a/management/server/management_test.go b/management/server/management_test.go
index 860f59a02..de44f3f96 100644
--- a/management/server/management_test.go
+++ b/management/server/management_test.go
@@ -316,9 +316,6 @@ var _ = Describe("Management service", func() {
 				initialPeers := 10
 				additionalPeers := 10
 
-				ctx, cancel := context.WithCancel(context.Background())
-				defer cancel()
-
 				var peers []wgtypes.Key
 				for i := 0; i < initialPeers; i++ {
 					key, _ := wgtypes.GenerateKey()
@@ -326,7 +323,6 @@ var _ = Describe("Management service", func() {
 					peers = append(peers, key)
 				}
 
-				time.Sleep(3 * time.Second)
 				wg := sync2.WaitGroup{}
 				wgCounter := initialPeers + initialPeers*additionalPeers
 				wg.Add(wgCounter)
@@ -340,15 +336,13 @@ var _ = Describe("Management service", func() {
 						Expect(err).NotTo(HaveOccurred())
 
 						// open stream
-						sync, err := client.Sync(ctx, &mgmtProto.EncryptedMessage{
+						sync, err := client.Sync(context.Background(), &mgmtProto.EncryptedMessage{
 							WgPubKey: peer.PublicKey().String(),
 							Body:     encryptedBytes,
 						})
 						Expect(err).NotTo(HaveOccurred())
 						clients = append(clients, sync)
 
-						time.Sleep(1 * time.Second)
-
 						// receive stream
 						go func() {
 							for {
@@ -364,11 +358,8 @@ var _ = Describe("Management service", func() {
 								err = pb.Unmarshal(decryptedBytes, resp)
 								Expect(err).NotTo(HaveOccurred())
 								if len(resp.GetRemotePeers()) > 0 {
-									log.Println("Received Sync response in tests")
 									// only consider peer updates
 									wg.Done()
-								} else {
-									log.Println("Received empty Sync response in tests")
 								}
 							}
 						}()