diff --git a/.changeset/eleven-doors-down.md b/.changeset/eleven-doors-down.md
index 47cb99dd03..a253828c54 100644
--- a/.changeset/eleven-doors-down.md
+++ b/.changeset/eleven-doors-down.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-mcp-actions-backend': patch
 ---
 
-Proxy `/.well-known/oauth-authorization-server` to `/.well-known/openid-configuration` on `auth-backend`
+Proxy `/.well-known/oauth-authorization-server` to `/.well-known/openid-configuration` on `auth-backend` when `auth.experimental.enableDynamicClientRegistration` is enabled.
diff --git a/.changeset/eleven-doors-own.md b/.changeset/eleven-doors-own.md
index 1308aab3eb..8c83082b22 100644
--- a/.changeset/eleven-doors-own.md
+++ b/.changeset/eleven-doors-own.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-auth-backend': patch
 ---
 
-Implementing Dynamic Client Registration with the OIDC server
+Implementing Dynamic Client Registration with the OIDC server. You can enable this by setting `auth.experimental.enableDynamicClientRegistration` in `app-config.yaml`. This is highly experimental, but feedback welcome.
diff --git a/packages/backend-test-utils/src/database/TestDatabases.ts b/packages/backend-test-utils/src/database/TestDatabases.ts
index 00fae4130a..cd20e2997b 100644
--- a/packages/backend-test-utils/src/database/TestDatabases.ts
+++ b/packages/backend-test-utils/src/database/TestDatabases.ts
@@ -104,7 +104,7 @@ export class TestDatabases {
     if (supportedIds.length > 0) {
       afterAll(async () => {
         await databases.shutdown();
-      }, 30_000);
+      });
     }
 
     return databases;
diff --git a/plugins/auth-backend/src/database/OidcDatabase.test.ts b/plugins/auth-backend/src/database/OidcDatabase.test.ts
index 9965069acf..19285aec0a 100644
--- a/plugins/auth-backend/src/database/OidcDatabase.test.ts
+++ b/plugins/auth-backend/src/database/OidcDatabase.test.ts
@@ -18,6 +18,8 @@ import { AuthDatabase } from './AuthDatabase';
 import { OidcDatabase } from './OidcDatabase';
 import { resolvePackagePath } from '@backstage/backend-plugin-api';
 
+jest.setTimeout(60_000);
+
 describe('Oidc Database', () => {
   const databases = TestDatabases.create();
 
diff --git a/plugins/auth-backend/src/service/OidcRouter.test.ts b/plugins/auth-backend/src/service/OidcRouter.test.ts
index 8714eb7f62..bffe9ee509 100644
--- a/plugins/auth-backend/src/service/OidcRouter.test.ts
+++ b/plugins/auth-backend/src/service/OidcRouter.test.ts
@@ -34,6 +34,8 @@ import { AuthDatabase } from '../database/AuthDatabase';
 import { OidcService } from '../service/OidcService';
 import { TokenIssuer } from '../identity/types';
 
+jest.setTimeout(60_000);
+
 describe('OidcRouter', () => {
   const MOCK_USER_TOKEN = 'mock-user-token';
   const MOCK_USER_ENTITY_REF = 'user:default/test-user';