diff --git a/federationapi/federationapi.go b/federationapi/federationapi.go
index 9299b5016..db272f1c8 100644
--- a/federationapi/federationapi.go
+++ b/federationapi/federationapi.go
@@ -35,7 +35,7 @@ func AddPublicRoutes(
 	accountsDB accounts.Database,
 	deviceDB devices.Database,
 	federation *gomatrixserverlib.FederationClient,
-	keyRing *gomatrixserverlib.KeyRing,
+	keyRing gomatrixserverlib.JSONVerifier,
 	rsAPI roomserverAPI.RoomserverInternalAPI,
 	asAPI appserviceAPI.AppServiceQueryAPI,
 	federationSenderAPI federationSenderAPI.FederationSenderInternalAPI,
@@ -44,7 +44,7 @@ func AddPublicRoutes(
 
 	routing.Setup(
 		router, cfg, rsAPI, asAPI,
-		eduAPI, federationSenderAPI, *keyRing,
+		eduAPI, federationSenderAPI, keyRing,
 		federation, accountsDB, deviceDB,
 	)
 }
diff --git a/federationapi/federationapi_test.go b/federationapi/federationapi_test.go
index 79c4c2cf6..cf7d732bf 100644
--- a/federationapi/federationapi_test.go
+++ b/federationapi/federationapi_test.go
@@ -27,11 +27,11 @@ func TestRoomsV3URLEscapeDoNot404(t *testing.T) {
 	cfg.Database.Naffka = "file::memory:"
 	cfg.SetDefaults()
 	base := setup.NewBaseDendrite(cfg, "Test", false)
+	keyRing := &test.NopJSONVerifier{}
 	fsAPI := base.FederationSenderHTTPClient()
-	skAPI := base.ServerKeyAPIClient()
 	// TODO: This is pretty fragile, as if anything calls anything on these nils this test will break.
 	// Unfortunately, it makes little sense to instantiate these dependencies when we just want to test routing.
-	federationapi.AddPublicRoutes(base.PublicAPIMux, cfg, nil, nil, nil, skAPI, nil, nil, fsAPI, nil)
+	federationapi.AddPublicRoutes(base.PublicAPIMux, cfg, nil, nil, nil, keyRing, nil, nil, fsAPI, nil)
 	httputil.SetupHTTPAPI(
 		base.BaseMux,
 		base.PublicAPIMux,
diff --git a/federationapi/routing/routing.go b/federationapi/routing/routing.go
index 70b77a4c3..350febbc1 100644
--- a/federationapi/routing/routing.go
+++ b/federationapi/routing/routing.go
@@ -51,7 +51,7 @@ func Setup(
 	asAPI appserviceAPI.AppServiceQueryAPI,
 	eduAPI eduserverAPI.EDUServerInputAPI,
 	fsAPI federationSenderAPI.FederationSenderInternalAPI,
-	keys gomatrixserverlib.KeyRing,
+	keys gomatrixserverlib.JSONVerifier,
 	federation *gomatrixserverlib.FederationClient,
 	accountDB accounts.Database,
 	deviceDB devices.Database,