diff --git a/cmd/mattermost/commands/version_test.go b/cmd/mattermost/commands/version_test.go
index ba55e3bf47..57e373bf2e 100644
--- a/cmd/mattermost/commands/version_test.go
+++ b/cmd/mattermost/commands/version_test.go
@@ -8,6 +8,10 @@ import (
 )
 
 func TestVersion(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping version test in short mode")
+	}
+
 	th := SetupWithStoreMock(t)
 	defer th.TearDown()
 
diff --git a/config/migrate_test.go b/config/migrate_test.go
index 7009976843..ac2ac49b83 100644
--- a/config/migrate_test.go
+++ b/config/migrate_test.go
@@ -18,6 +18,9 @@ import (
 type cleanUpFn func(store *Store)
 
 func TestMigrate(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping migration test in short mode")
+	}
 	files := []string{
 		"IdpCertificateFile",
 		"PublicCertificateFile",