diff --git a/pkg/server/testserver.go b/pkg/server/testserver.go
index 44220de0188b..6ad2fb813aa6 100644
--- a/pkg/server/testserver.go
+++ b/pkg/server/testserver.go
@@ -52,6 +52,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sqlmigrations"
 	"github.com/cockroachdb/cockroach/pkg/storage"
 	"github.com/cockroachdb/cockroach/pkg/storage/cloud"
+	"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
 	"github.com/cockroachdb/cockroach/pkg/ts"
 	"github.com/cockroachdb/cockroach/pkg/util"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
@@ -79,6 +80,10 @@ func makeTestConfig(st *cluster.Settings) Config {
 
 	// Configure test storage engine.
 	cfg.StorageEngine = storage.DefaultStorageEngine
+	// Resolve the storage engine to a specific type if it's the default value.
+	if cfg.StorageEngine == enginepb.EngineTypeDefault {
+		cfg.StorageEngine = enginepb.EngineTypePebble
+	}
 
 	// Configure the default in-memory temp storage for all tests unless
 	// otherwise configured.