diff --git a/management/server/store/sqlstore_bench_test.go b/management/server/store/sqlstore_bench_test.go
index 85b76f4c3..350a1da83 100644
--- a/management/server/store/sqlstore_bench_test.go
+++ b/management/server/store/sqlstore_bench_test.go
@@ -238,8 +238,6 @@ func connectDBforTest(ctx context.Context, dsn string) (*pgxpool.Pool, error) {
 		pool.Close()
 		return nil, fmt.Errorf("unable to ping database: %w", err)
 	}
-
-	fmt.Println("Successfully connected to the database!")
 	return pool, nil
 }
 
@@ -269,7 +267,10 @@ func setupBenchmarkDB(b testing.TB) (*SqlStore, func(), string) {
 	}
 
 	for i := len(models) - 1; i >= 0; i-- {
-		db.Migrator().DropTable(models[i])
+		err := db.Migrator().DropTable(models[i])
+		if err != nil {
+			b.Fatalf("failed to drop table: %v", err)
+		}
 	}
 
 	err = db.AutoMigrate(models...)
diff --git a/management/server/store/store.go b/management/server/store/store.go
index 21b660d96..47f0976aa 100644
--- a/management/server/store/store.go
+++ b/management/server/store/store.go
@@ -468,6 +468,9 @@ func getSqlStoreEngine(ctx context.Context, store *SqlStore, kind types.Engine)
 	closeConnection := func() {
 		cleanup()
 		store.Close(ctx)
+		if store.pool != nil {
+			store.pool.Close()
+		}
 	}
 
 	return store, closeConnection, nil