diff --git a/test/db.go b/test/db.go
index 3a817fd08..4c95e307f 100644
--- a/test/db.go
+++ b/test/db.go
@@ -65,6 +65,10 @@ func createRemoteDB(t *testing.T, dbName, user, connStr string) {
 		fatalError(t, "failed to open postgres conn with connstr=%s : %s", connStr, err)
 	}
 	if err = db.Ping(); err != nil {
+		// If we're unable to reach the database, it's unlikely that a postgres server is
+		// available for testing. Set Required to false to skip the test instead of failing it.
+		Required = false
+		t.Logf("Note: tests require a postgres install accessible to the current user")
 		fatalError(t, "failed to open postgres conn with connstr=%s : %s", connStr, err)
 	}
 	_, err = db.Exec(fmt.Sprintf(`CREATE DATABASE %s;`, dbName))
@@ -169,9 +173,6 @@ 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 81025fd3b..15fb5c370 100644
--- a/test/testrig/base.go
+++ b/test/testrig/base.go
@@ -30,9 +30,6 @@ 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,