diff --git a/packages/e2e-test-utils/src/activate-plugin.js b/packages/e2e-test-utils/src/activate-plugin.js
index 1cfe3786f4cdbd..9d90f866ff5dd5 100644
--- a/packages/e2e-test-utils/src/activate-plugin.js
+++ b/packages/e2e-test-utils/src/activate-plugin.js
@@ -15,6 +15,7 @@ export async function activatePlugin( slug ) {
 	await visitAdminPage( 'plugins.php' );
 	const disableLink = await page.$( `tr[data-slug="${ slug }"] .deactivate a` );
 	if ( disableLink ) {
+		await switchUserToTest();
 		return;
 	}
 	await page.click( `tr[data-slug="${ slug }"] .activate a` );
diff --git a/packages/e2e-test-utils/src/deactivate-plugin.js b/packages/e2e-test-utils/src/deactivate-plugin.js
index bfaaf7e0a7eeba..88603d0aa47729 100644
--- a/packages/e2e-test-utils/src/deactivate-plugin.js
+++ b/packages/e2e-test-utils/src/deactivate-plugin.js
@@ -13,6 +13,11 @@ import { visitAdminPage } from './visit-admin-page';
 export async function deactivatePlugin( slug ) {
 	await switchUserToAdmin();
 	await visitAdminPage( 'plugins.php' );
+	const deleteLink = await page.$( `tr[data-slug="${ slug }"] .delete a` );
+	if ( deleteLink ) {
+		await switchUserToTest();
+		return;
+	}
 	await page.click( `tr[data-slug="${ slug }"] .deactivate a` );
 	await page.waitForSelector( `tr[data-slug="${ slug }"] .delete a` );
 	await switchUserToTest();