diff --git a/bin/plugin/commands/performance.js b/bin/plugin/commands/performance.js
index eb9e18d74d4d5a..ce8953f64f7663 100644
--- a/bin/plugin/commands/performance.js
+++ b/bin/plugin/commands/performance.js
@@ -32,6 +32,8 @@ const RESULTS_FILE_SUFFIX = '.performance-results.json';
  * @property {string=}  wpVersion   The WordPress version to be used as the base install for testing.
  */
 
+const perfStartTime = performance.now();
+
 /**
  * A logging helper for printing steps and their substeps.
  *
@@ -40,9 +42,21 @@ const RESULTS_FILE_SUFFIX = '.performance-results.json';
  * @param {...any} args   Rest of the arguments to pass to console.log.
  */
 function logAtIndent( indent, msg, ...args ) {
+	const elapsed = performance.now() - perfStartTime;
+	const totalSeconds = Math.floor( elapsed / 100 ) / 10;
+	const minutes = Math.floor( totalSeconds / 60 );
+	const seconds = ( totalSeconds % 60 ).toFixed( 1 ).padStart( 4, '0' );
+	const timestamp = `[${ String( minutes ).padStart(
+		2,
+		'0'
+	) }:${ seconds }]`;
+
 	const prefix = indent === 0 ? '▶ ' : '> ';
 	const newline = indent === 0 ? '\n' : '';
-	return log( newline + '    '.repeat( indent ) + prefix + msg, ...args );
+	return log(
+		newline + timestamp + ' ' + '    '.repeat( indent ) + prefix + msg,
+		...args
+	);
 }
 
 /**
@@ -346,7 +360,7 @@ async function runPerformanceTests( branches, options ) {
 
 	logAtIndent( 2, 'Installing dependencies and building' );
 	await runShellScript(
-		`bash -c "source $HOME/.nvm/nvm.sh && nvm install && npm ci && npx playwright install chromium --with-deps && npm run build"`,
+		`bash -c "source $HOME/.nvm/nvm.sh && nvm install && npm ci && npx playwright install chromium --with-deps"`,
 		testRunnerDir
 	);
 
@@ -389,7 +403,7 @@ async function runPerformanceTests( branches, options ) {
 
 		logAtIndent( 3, 'Installing dependencies and building' );
 		await runShellScript(
-			`bash -c "source $HOME/.nvm/nvm.sh && nvm install && npm ci && npm run build"`,
+			`bash -c "source $HOME/.nvm/nvm.sh && nvm install && npm ci && npm run build -- --skip-types"`,
 			buildDir
 		);
 
@@ -467,38 +481,37 @@ async function runPerformanceTests( branches, options ) {
 
 	const wpEnvPath = path.join( testRunnerDir, 'node_modules/.bin/wp-env' );
 
-	for ( const testSuite of testSuites ) {
-		for ( let i = 1; i <= TEST_ROUNDS; i++ ) {
+	for ( let i = 1; i <= TEST_ROUNDS; i++ ) {
+		for ( const [ branchIdx, branch ] of branches.entries() ) {
 			logAtIndent(
 				1,
 				// prettier-ignore
-				`Suite: ${ formats.success( testSuite ) } (round ${ i } of ${ TEST_ROUNDS })`
+				`Branch: ${ formats.success( branch ) } (round ${ i } of ${ TEST_ROUNDS })`
 			);
 
-			for ( const [ branchIdx, branch ] of branches.entries() ) {
-				logAtIndent( 2, 'Branch:', formats.success( branch ) );
+			const sanitizedBranchName = sanitizeBranchName( branch );
+			// @ts-ignore
+			const envDir = branchDirs[ branch ];
 
-				const sanitizedBranchName = sanitizeBranchName( branch );
-				const runKey = `${ testSuite }_${ sanitizedBranchName }_round-${ i }`;
-				// @ts-ignore
-				const envDir = branchDirs[ branch ];
+			logAtIndent( 2, 'Starting environment' );
+			await runShellScript( `${ wpEnvPath } start`, envDir );
+
+			for ( const testSuite of testSuites ) {
+				logAtIndent( 2, `Suite: ${ formats.success( testSuite ) }` );
 
-				logAtIndent( 3, 'Starting environment' );
-				await runShellScript( `${ wpEnvPath } start`, envDir );
+				const runKey = `${ testSuite }_${ sanitizedBranchName }_round-${ i }`;
 
 				logAtIndent( 3, 'Running tests' );
-				// Only the head branch saves traces; comparison branches share
-				// the same artifacts directory and would otherwise overwrite.
 				await runTestSuite(
 					testSuite,
 					testRunnerDir,
 					runKey,
 					branchIdx === 0
 				);
-
-				logAtIndent( 3, 'Stopping environment' );
-				await runShellScript( `${ wpEnvPath } stop`, envDir );
 			}
+
+			logAtIndent( 2, 'Stopping environment' );
+			await runShellScript( `${ wpEnvPath } stop`, envDir );
 		}
 	}
 
diff --git a/packages/e2e-test-utils-playwright/package.json b/packages/e2e-test-utils-playwright/package.json
index d3dffb0812e748..8d240b08abf16f 100644
--- a/packages/e2e-test-utils-playwright/package.json
+++ b/packages/e2e-test-utils-playwright/package.json
@@ -28,11 +28,10 @@
 		"build",
 		"build-types"
 	],
-	"main": "./build/index.cjs",
 	"exports": {
 		".": {
 			"types": "./build-types/index.d.ts",
-			"default": "./build/index.cjs"
+			"default": "./src/index.ts"
 		},
 		"./package.json": "./package.json"
 	},