@@ -9,26 +9,45 @@ export interface User {
 }
 
 async function login( this: RequestUtils, user: User = this.user ) {
-	// Login to admin using request context.
-	let response = await this.request.post( 'wp-login.php', {
-		failOnStatusCode: true,
-		form: {
-			log: user.username,
-			pwd: user.password,
-		},
-	} );
-	await response.dispose();
+	// Get the client ID and secret from the environment.
+	const clientId = process.env.WP_CLIENT_ID;
+	const clientSecret = process.env.WP_CLIENT_SECRET;
+	if ( ! clientId || ! clientSecret ) {
+		throw new Error(
+			'WP_CLIENT_ID and WP_CLIENT_SECRET environment variables must be set.'
+		);
+	}
 
-	// Get the nonce.
-	response = await this.request.get(
-		'wp-admin/admin-ajax.php?action=rest-nonce',
+	// Log in and get the bearer token.
+	const response = await this.request.post(
+		'https://wordpress.com/wp-login.php?action=login-endpoint',
 		{
+			headers: {
+				Accept: 'application/json',
+				'Content-Type': 'application/x-www-form-urlencoded',
+			},
 			failOnStatusCode: true,
+			form: {
+				username: user.username,
+				password: user.password,
+				client_id: clientId,
+				client_secret: clientSecret,
+				get_bearer_token: '1',
+			},
 		}
 	);
-	const nonce = await response.text();
 
-	return nonce;
+	const payload = await response.json();
+
+	await response.dispose();
+
+	if ( ! payload?.data?.bearer_token ) {
+		throw new Error(
+			'Unable to log in. Please check your username and password.'
+		);
+	}
+
+	return payload.data.bearer_token as string;
 }
 
 export { login };
@@ -21,34 +21,15 @@ function splitRequestsToChunks( requests: BatchRequest[], chunkSize: number ) {
 	return cache;
 }
 
-async function getAPIRootURL( request: APIRequestContext ) {
-	// Discover the API root url using link header.
-	// See https://developer.wordpress.org/rest-api/using-the-rest-api/discovery/#link-header
-	const response = await request.head( WP_BASE_URL );
-	const links = response.headers().link;
-	const restLink = links?.match( /<([^>]+)>; rel="https:\/\/api\.w\.org\/"/ );
-
-	if ( ! restLink ) {
-		throw new Error( `Failed to discover REST API endpoint.
- Link header: ${ links }` );
-	}
-
-	const [ , rootURL ] = restLink;
-
-	return rootURL;
-}
-
 async function setupRest( this: RequestUtils ): Promise< StorageState > {
-	const [ nonce, rootURL ] = await Promise.all( [
-		this.login(),
-		getAPIRootURL( this.request ),
-	] );
+	const rootURL = 'https://public-api.wordpress.com/';
+	const bearerToken = await this.login();
 
 	const { cookies } = await this.request.storageState();
 
 	const storageState: StorageState = {
 		cookies,
-		nonce,
+		bearerToken,
 		rootURL,
 	};
 
@@ -84,11 +65,18 @@ async function rest< RestResponse = any >(
 		throw new Error( '"path" is required to make a REST call' );
 	}
 
-	if ( ! this.storageState?.nonce || ! this.storageState?.rootURL ) {
+	if ( ! this.storageState?.bearerToken || ! this.storageState?.rootURL ) {
 		await this.setupRest();
 	}
 
-	const relativePath = path.startsWith( '/' ) ? path.slice( 1 ) : path;
+	const wpcomPath = path.replace(
+		'/wp/v2/',
+		`/wp/v2/sites/${ new URL( WP_BASE_URL ).host }/`
+	);
+
+	const relativePath = wpcomPath.startsWith( '/' )
+		? wpcomPath.slice( 1 )
+		: wpcomPath;
 
 	const url = this.storageState!.rootURL + relativePath;
 
@@ -97,7 +85,7 @@ async function rest< RestResponse = any >(
 			...fetchOptions,
 			failOnStatusCode: false,
 			headers: {
-				'X-WP-Nonce': this.storageState!.nonce,
+				Authorization: `Bearer ${ this.storageState!.bearerToken }`,
 				...( fetchOptions.headers || {} ),
 			},
 		} );
@@ -110,16 +98,16 @@ async function rest< RestResponse = any >(
 		return json;
 	} catch ( error ) {
 		// Nonce in invalid, retry again with a renewed nonce.
-		if (
-			typeof error === 'object' &&
-			error !== null &&
-			Object.prototype.hasOwnProperty.call( error, 'code' ) &&
-			( error as { code: string } ).code === 'rest_cookie_invalid_nonce'
-		) {
-			await this.setupRest();
-
-			return this.rest( options );
-		}
+		// if (
+		// 	typeof error === 'object' &&
+		// 	error !== null &&
+		// 	Object.prototype.hasOwnProperty.call( error, 'code' ) &&
+		// 	( error as { code: string } ).code === 'rest_cookie_invalid_nonce'
+		// ) {
+		// 	await this.setupRest();
+
+		// 	return this.rest( options );
+		// }
 
 		throw error;
 	}
 
@@ -26,17 +26,17 @@ async function globalSetup( config: FullConfig ) {
 	await requestUtils.setupRest();
 
 	// Reset the test environment before running the tests.
-	await Promise.all( [
-		requestUtils.activateTheme( 'twentytwentyone' ),
-		// Disable this test plugin as it's conflicting with some of the tests.
-		// We already have reduced motion enabled and Playwright will wait for most of the animations anyway.
-		requestUtils.deactivatePlugin(
-			'gutenberg-test-plugin-disables-the-css-animations'
-		),
-		requestUtils.deleteAllPosts(),
-		requestUtils.deleteAllBlocks(),
-		requestUtils.resetPreferences(),
-	] );
+	// await Promise.all( [
+	// requestUtils.activateTheme( 'twentytwentyone' ),
+	// Disable this test plugin as it's conflicting with some of the tests.
+	// We already have reduced motion enabled and Playwright will wait for most of the animations anyway.
+	// requestUtils.deactivatePlugin(
+	// 	'gutenberg-test-plugin-disables-the-css-animations'
+	// ),
+	// requestUtils.deleteAllPosts(),
+	// requestUtils.deleteAllBlocks(),
+	// requestUtils.resetPreferences(),
+	// ] );
 
 	await requestContext.dispose();
 }