diff --git a/extensions/google/oauth.test.ts b/extensions/google/oauth.test.ts
index 3fcb701c512..4220f7015d4 100644
--- a/extensions/google/oauth.test.ts
+++ b/extensions/google/oauth.test.ts
@@ -820,9 +820,8 @@ describe("loginGeminiCliOAuth", () => {
     );
 
     const { requests } = installGeminiOAuthFetchMock(() => undefined);
-
-    const { loginGeminiCliOAuth } = await import("./oauth.js");
-    const { result } = await runRemoteLoginWithCapturedAuthUrl(loginGeminiCliOAuth);
+    const { exchangeCodeForTokens } = await import("./oauth.token.js");
+    const result = await exchangeCodeForTokens("oauth-code", "pkce-verifier");
 
     expect(result.projectId).toBeUndefined();
     expect(requests.map(({ url }) => url)).toEqual([TOKEN_URL, USERINFO_URL]);
diff --git a/test/helpers/plugins/provider-discovery-contract.ts b/test/helpers/plugins/provider-discovery-contract.ts
index 791fa1c0473..8169283698a 100644
--- a/test/helpers/plugins/provider-discovery-contract.ts
+++ b/test/helpers/plugins/provider-discovery-contract.ts
@@ -1,7 +1,10 @@
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import type { AuthProfileStore } from "../../../src/agents/auth-profiles/types.js";
 import type { OpenClawConfig } from "../../../src/config/config.js";
-import { registerProviders, requireProvider } from "./contracts-testkit.js";
+import {
+  registerProviderPlugins as registerProviders,
+  requireRegisteredProvider as requireProvider,
+} from "../../../src/test-utils/plugin-registration.js";
 
 const resolveCopilotApiTokenMock = vi.hoisted(() => vi.fn());
 const buildVllmProviderMock = vi.hoisted(() => vi.fn());