diff --git a/tests/EndToEnd.suite.yml b/tests/EndToEnd.suite.yml
index dc2656d..07bcc91 100644
--- a/tests/EndToEnd.suite.yml
+++ b/tests/EndToEnd.suite.yml
@@ -40,8 +40,10 @@ modules:
             capabilities:
               "goog:chromeOptions":
                 args:
+                  - "--headless"
                   - "--disable-gpu"
                   - "--disable-dev-shm-usage"
+                  - "--disable-software-rasterizer"
                   - "--proxy-server='direct://'"
                   - "--proxy-bypass-list=*"
                   - "--no-sandbox"
diff --git a/tests/Support/Helper/ThirdPartyPlugin.php b/tests/Support/Helper/ThirdPartyPlugin.php
index ec926d6..1893cd7 100644
--- a/tests/Support/Helper/ThirdPartyPlugin.php
+++ b/tests/Support/Helper/ThirdPartyPlugin.php
@@ -65,10 +65,23 @@ public function deactivateThirdPartyPlugin($I, $name)
 		// Wait for the Plugins page to load.
 		$I->waitForElementVisible('body.plugins-php');
 
-		// Deactivate the Plugin.
-		$I->checkOption('//*[@data-slug="' . $name . '"]/th/input');
-		$I->selectOption('action', 'deactivate-selected');
-		$I->click('#doaction');
+		// Depending on the Plugin name, perform deactivation.
+		switch ($name) {
+			case 'wpforms-lite':
+				// Using the check option results in a 502 Bad Gateway error.
+				$I->click('a#deactivate-' . $name);
+				break;
+
+			default:
+				// Deactivate the Plugin.
+				$I->checkOption('//*[@data-slug="' . $name . '"]/th/input');
+				$I->selectOption('action', 'deactivate-selected');
+				$I->click('#doaction');
+
+				// Wait for the Plugins page to load with the Plugin deactivated, to confirm it deactivated.
+				$I->waitForElementVisible('table.plugins tr[data-slug=' . $name . '].inactive');
+				break;
+		}
 	}
 
 	/**