diff --git a/test/db.go b/test/db.go
index 17f637e18..3a817fd08 100644
--- a/test/db.go
+++ b/test/db.go
@@ -169,6 +169,9 @@ func PrepareDBConnectionString(t *testing.T, dbType DBType) (connStr string, clo
 
 // Creates subtests with each known DBType
 func WithAllDatabases(t *testing.T, testFn func(t *testing.T, db DBType)) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	dbs := map[string]DBType{
 		"postgres": DBTypePostgres,
 		"sqlite":   DBTypeSQLite,
diff --git a/test/testrig/base.go b/test/testrig/base.go
index 15fb5c370..81025fd3b 100644
--- a/test/testrig/base.go
+++ b/test/testrig/base.go
@@ -30,6 +30,9 @@ import (
 )
 
 func CreateBaseDendrite(t *testing.T, dbType test.DBType) (*base.BaseDendrite, func()) {
+	if testing.Short() {
+		t.Skip("skipping test in short mode.")
+	}
 	var cfg config.Dendrite
 	cfg.Defaults(config.DefaultOpts{
 		Generate:   false,