diff --git a/auth/db/migrate_test.go b/auth/db/migrate_test.go
index e07143cad..340f1309c 100644
--- a/auth/db/migrate_test.go
+++ b/auth/db/migrate_test.go
@@ -11,8 +11,13 @@ import (
 )
 
 func TestMigrations(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+		return
+	}
+
 	args := []string{
-		// "--rm",
+		"--rm",
 		"-e", "MYSQL_ROOT_PASSWORD=root",
 		"-e", "MYSQL_DATABASE=test",
 	}
diff --git a/crm/db/migrate_test.go b/crm/db/migrate_test.go
index e07143cad..340f1309c 100644
--- a/crm/db/migrate_test.go
+++ b/crm/db/migrate_test.go
@@ -11,8 +11,13 @@ import (
 )
 
 func TestMigrations(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+		return
+	}
+
 	args := []string{
-		// "--rm",
+		"--rm",
 		"-e", "MYSQL_ROOT_PASSWORD=root",
 		"-e", "MYSQL_DATABASE=test",
 	}
diff --git a/crm/repository/main_test.go b/crm/repository/main_test.go
index dc17d509c..911da3859 100644
--- a/crm/repository/main_test.go
+++ b/crm/repository/main_test.go
@@ -9,6 +9,11 @@ import (
 )
 
 func TestMain(m *testing.M) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+		return
+	}
+
 	// @todo this is a very optimistic initialization, make it more robust
 	godotenv.Load("../../.env")
 
@@ -22,10 +27,6 @@ func TestMain(m *testing.M) {
 	flag.StringVar(&dsn, p("db-dsn"), "crust:crust@tcp(db1:3306)/crust?collation=utf8mb4_general_ci", "DSN for database connection")
 	flag.Parse()
 
-	if testing.Short() {
-		return
-	}
-
 	factory.Database.Add("default", dsn)
 
 	db := factory.Database.MustGet()
diff --git a/sam/db/migrate_test.go b/sam/db/migrate_test.go
index e07143cad..340f1309c 100644
--- a/sam/db/migrate_test.go
+++ b/sam/db/migrate_test.go
@@ -11,8 +11,13 @@ import (
 )
 
 func TestMigrations(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+		return
+	}
+
 	args := []string{
-		// "--rm",
+		"--rm",
 		"-e", "MYSQL_ROOT_PASSWORD=root",
 		"-e", "MYSQL_DATABASE=test",
 	}