diff --git a/tests/e2e/specs/admin/site-scan-panel.js b/tests/e2e/specs/admin/site-scan-panel.js
index 9239c20680d..68507771f53 100644
--- a/tests/e2e/specs/admin/site-scan-panel.js
+++ b/tests/e2e/specs/admin/site-scan-panel.js
@@ -26,7 +26,7 @@ describe( 'AMP settings screen Site Scan panel', () => {
 
 	beforeAll( async () => {
 		await installTheme( 'hestia' );
-		await installPlugin( 'autoptimize' );
+		await installPlugin( 'akismet' );
 
 		await cleanUpSettings();
 
@@ -36,7 +36,7 @@ describe( 'AMP settings screen Site Scan panel', () => {
 
 	afterAll( async () => {
 		await deleteTheme( 'hestia', { newThemeSlug: 'twentytwenty' } );
-		await uninstallPlugin( 'autoptimize' );
+		await uninstallPlugin( 'akismet' );
 
 		await cleanUpSettings();
 	} );
@@ -96,7 +96,7 @@ describe( 'AMP settings screen Site Scan panel', () => {
 
 	it( 'lists Autoptimize plugin as causing AMP incompatibility', async () => {
 		await activateTheme( 'twentytwenty' );
-		await activatePlugin( 'autoptimize' );
+		await activatePlugin( 'akismet' );
 
 		await visitAdminPage( 'admin.php', 'page=amp-options' );
 
@@ -107,12 +107,12 @@ describe( 'AMP settings screen Site Scan panel', () => {
 
 		await expect( page ).not.toMatchElement( '.site-scan-results--themes' );
 
-		await deactivatePlugin( 'autoptimize' );
+		await deactivatePlugin( 'akismet' );
 	} );
 
 	it( 'lists Hestia theme and Autoptimize plugin for causing AMP incompatibilities', async () => {
 		await activateTheme( 'hestia' );
-		await activatePlugin( 'autoptimize' );
+		await activatePlugin( 'akismet' );
 
 		await visitAdminPage( 'admin.php', 'page=amp-options' );
 
@@ -127,12 +127,12 @@ describe( 'AMP settings screen Site Scan panel', () => {
 		await expect( page ).toMatchElement( '.site-scan-results--themes .site-scan-results__source-name', { text: /Hestia/ } );
 		await expect( page ).toMatchElement( '.site-scan-results--plugins .site-scan-results__source-name', { text: /Autoptimize/ } );
 
-		await deactivatePlugin( 'autoptimize' );
+		await deactivatePlugin( 'akismet' );
 	} );
 
 	it( 'displays a notice if a plugin has been deactivated or removed', async () => {
 		await activateTheme( 'twentytwenty' );
-		await activatePlugin( 'autoptimize' );
+		await activatePlugin( 'akismet' );
 
 		await visitAdminPage( 'admin.php', 'page=amp-options' );
 
@@ -141,7 +141,7 @@ describe( 'AMP settings screen Site Scan panel', () => {
 		await expect( page ).toMatchElement( '.site-scan-results--plugins .site-scan-results__source-name', { text: /Autoptimize/, timeout } );
 
 		// Deactivate the plugin and test.
-		await deactivatePlugin( 'autoptimize' );
+		await deactivatePlugin( 'akismet' );
 
 		await visitAdminPage( 'admin.php', 'page=amp-options' );
 
@@ -149,19 +149,19 @@ describe( 'AMP settings screen Site Scan panel', () => {
 		await expect( page ).toMatchElement( '.site-scan-results--plugins .site-scan-results__source-notice', { text: /This plugin has been deactivated since last site scan./ } );
 
 		// Uninstall the plugin and test.
-		await uninstallPlugin( 'autoptimize' );
+		await uninstallPlugin( 'akismet' );
 
 		await visitAdminPage( 'admin.php', 'page=amp-options' );
 
-		await expect( page ).toMatchElement( '.site-scan-results--plugins .site-scan-results__source-slug', { text: /autoptimize/ } );
+		await expect( page ).toMatchElement( '.site-scan-results--plugins .site-scan-results__source-slug', { text: /akismet/ } );
 		await expect( page ).toMatchElement( '.site-scan-results--plugins .site-scan-results__source-notice', { text: /This plugin has been uninstalled since last site scan./ } );
 
 		// Clean up.
-		await installPlugin( 'autoptimize' );
+		await installPlugin( 'akismet' );
 	} );
 
 	it( 'automatically triggers a scan if Plugin Suppression option has changed', async () => {
-		await activatePlugin( 'autoptimize' );
+		await activatePlugin( 'akismet' );
 
 		await visitAdminPage( 'admin.php', 'page=amp-options' );
 
@@ -181,6 +181,6 @@ describe( 'AMP settings screen Site Scan panel', () => {
 			isAmpFirst: false,
 		} );
 
-		await deactivatePlugin( 'autoptimize' );
+		await deactivatePlugin( 'akismet' );
 	} );
 } );
diff --git a/tests/e2e/specs/amp-onboarding/site-scan.js b/tests/e2e/specs/amp-onboarding/site-scan.js
index b9a487bb6ec..7cd62bd484c 100644
--- a/tests/e2e/specs/amp-onboarding/site-scan.js
+++ b/tests/e2e/specs/amp-onboarding/site-scan.js
@@ -26,12 +26,12 @@ import {
 describe( 'Onboarding Wizard Site Scan Step', () => {
 	beforeAll( async () => {
 		await installTheme( 'hestia' );
-		await installPlugin( 'autoptimize' );
+		await installPlugin( 'akismet' );
 	} );
 
 	afterAll( async () => {
 		await deleteTheme( 'hestia', { newThemeSlug: 'twentytwenty' } );
-		await uninstallPlugin( 'autoptimize' );
+		await uninstallPlugin( 'akismet' );
 	} );
 
 	it( 'should start a site scan immediately', async () => {
@@ -57,7 +57,7 @@ describe( 'Onboarding Wizard Site Scan Step', () => {
 
 	it( 'should list out plugin and theme issues after the scan', async () => {
 		await activateTheme( 'hestia' );
-		await activatePlugin( 'autoptimize' );
+		await activatePlugin( 'akismet' );
 
 		await moveToSiteScanScreen( { technical: true } );
 
@@ -81,7 +81,7 @@ describe( 'Onboarding Wizard Site Scan Step', () => {
 		await testNextButton( { text: 'Next' } );
 		await testPreviousButton( { text: 'Previous' } );
 
-		await deactivatePlugin( 'autoptimize' );
+		await deactivatePlugin( 'akismet' );
 		await activateTheme( 'twentytwenty' );
 	} );
 } );