diff --git a/management/server/group_test.go b/management/server/group_test.go
index 5746e3d6b..1d4e25d03 100644
--- a/management/server/group_test.go
+++ b/management/server/group_test.go
@@ -871,7 +871,7 @@ func Test_AddPeerAndAddToAll(t *testing.T) {
 		return
 	}
 
-	const totalPeers = 300
+	const totalPeers = 1000
 
 	var wg sync.WaitGroup
 	errs := make(chan error, totalPeers)
diff --git a/management/server/peer_test.go b/management/server/peer_test.go
index db2cc0848..55c3610b7 100644
--- a/management/server/peer_test.go
+++ b/management/server/peer_test.go
@@ -2143,8 +2143,6 @@ func Test_IsUniqueConstraintError(t *testing.T) {
 }
 
 func Test_AddPeer(t *testing.T) {
-	t.Setenv("NETBIRD_STORE_ENGINE", string(types.PostgresStoreEngine))
-	t.Setenv("NB_GET_ACCOUNT_BUFFER_INTERVAL", "300ms")
 	manager, err := createManager(t)
 	if err != nil {
 		t.Fatal(err)