diff --git a/clientapi/routing/joinroom_test.go b/clientapi/routing/joinroom_test.go
index e4c52786f..0ddff8a95 100644
--- a/clientapi/routing/joinroom_test.go
+++ b/clientapi/routing/joinroom_test.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/matrix-org/dendrite/internal/caching"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
-	"github.com/matrix-org/dendrite/roomserver/storage"
 	"github.com/matrix-org/dendrite/setup/jetstream"
 	"github.com/matrix-org/gomatrixserverlib"
 	"github.com/matrix-org/gomatrixserverlib/spec"
@@ -34,10 +33,6 @@ func TestJoinRoomByIDOrAlias(t *testing.T) {
 
 		cm := sqlutil.NewConnectionManager(processCtx, cfg.Global.DatabaseOptions)
 		caches := caching.NewRistrettoCache(128*1024*1024, time.Hour, caching.DisableMetrics)
-		_, openErr := storage.Open(processCtx.Context(), cm, &cfg.RoomServer.Database, caches)
-		if openErr != nil {
-			t.Fatal(openErr)
-		}
 		natsInstance := jetstream.NATSInstance{}
 		rsAPI := roomserver.NewInternalAPI(processCtx, cfg, cm, &natsInstance, caches, caching.DisableMetrics)
 		userAPI := userapi.NewInternalAPI(processCtx, cfg, cm, &natsInstance, rsAPI, nil)
diff --git a/cmd/resolve-state/main.go b/cmd/resolve-state/main.go
index 1db345243..9974d09e3 100644
--- a/cmd/resolve-state/main.go
+++ b/cmd/resolve-state/main.go
@@ -69,7 +69,6 @@ func main() {
 	}
 
 	natsInstance := &jetstream.NATSInstance{}
-	_, _ = natsInstance.Prepare(processCtx, &cfg.Global.JetStream)
 	rsAPI := roomserver.NewInternalAPI(processCtx, cfg, cm,
 		natsInstance, caching.NewRistrettoCache(128*1024*1024, time.Hour, true), false)
 
diff --git a/roomserver/roomserver_test.go b/roomserver/roomserver_test.go
index 630aff061..077957fa1 100644
--- a/roomserver/roomserver_test.go
+++ b/roomserver/roomserver_test.go
@@ -517,7 +517,6 @@ func TestRedaction(t *testing.T) {
 		}
 
 		natsInstance := &jetstream.NATSInstance{}
-		_, _ = natsInstance.Prepare(processCtx, &cfg.Global.JetStream)
 		rsAPI := roomserver.NewInternalAPI(processCtx, cfg, cm, natsInstance, caches, caching.DisableMetrics)
 
 		for _, tc := range testCases {