diff --git a/packages/better-auth/src/plugins/mcp/mcp.test.ts b/packages/better-auth/src/plugins/mcp/mcp.test.ts
index dea11bbc84..cacfb9d6e4 100644
--- a/packages/better-auth/src/plugins/mcp/mcp.test.ts
+++ b/packages/better-auth/src/plugins/mcp/mcp.test.ts
@@ -369,18 +369,17 @@ describe("mcp", async () => {
 			});
 		const oAuthHeaders = new Headers();
 		const client = createAuthClient({
-			plugins: [genericOAuthClient()],
 			baseURL: "http://localhost:5004",
 			fetchOptions: { customFetchImpl: customFetchImplRP },
 		});
 
-		const data = await client.signIn.oauth2(
-			{ providerId: "test-confidential", callbackURL: "/dashboard" },
+		const data = await client.signIn.social(
+			{ provider: "test-confidential", callbackURL: "/dashboard" },
 			{ throw: true, onSuccess: cookieSetter(oAuthHeaders) },
 		);
 
 		let redirectURI = "";
-		await serverClient.$fetch(data.url, {
+		await serverClient.$fetch(data.url!, {
 			method: "GET",
 			onError(context: any) {
 				redirectURI = context.response.headers.get("Location") || "";
diff --git a/packages/better-auth/src/plugins/two-factor/two-factor.security.test.ts b/packages/better-auth/src/plugins/two-factor/two-factor.security.test.ts
index 62f3661020..2a48f96578 100644
--- a/packages/better-auth/src/plugins/two-factor/two-factor.security.test.ts
+++ b/packages/better-auth/src/plugins/two-factor/two-factor.security.test.ts
@@ -113,7 +113,7 @@ describe("two-factor security: sign-in does not leak session cookies (cookieCach
 		body: { password: testUser.password },
 		headers,
 	});
-	if (!enrollment.totpURI) {
+	if (enrollment.method !== "totp") {
 		throw new Error("expected totp enrollment");
 	}
 	const row = await db.findOne<TwoFactorTable>({
@@ -225,7 +225,7 @@ describe("two-factor security: sign-in does not leak session cookies (cookieCach
 		body: { password: testUser.password },
 		headers,
 	});
-	if (!enrollment.totpURI) {
+	if (enrollment.method !== "totp") {
 		throw new Error("expected totp enrollment");
 	}
 	const dbUser = await db.findOne<User>({
@@ -327,7 +327,7 @@ describe("two-factor security: chunked session_data is fully scrubbed on 2FA-req
 		body: { password: testUser.password },
 		headers,
 	});
-	if (!enrollment.totpURI) {
+	if (enrollment.method !== "totp") {
 		throw new Error("expected totp enrollment");
 	}
 	const row = await db.findOne<TwoFactorTable>({