diff --git a/test/e2e/snaps/test-snap-bip-44.spec.js b/test/e2e/snaps/test-snap-bip-44.spec.js
index d57cf831d..5672f63ce 100644
--- a/test/e2e/snaps/test-snap-bip-44.spec.js
+++ b/test/e2e/snaps/test-snap-bip-44.spec.js
@@ -71,6 +71,7 @@ describe('Test Snap bip-44', function () {
         // deal with permissions popover
         await driver.delay(1000);
         await driver.clickElement('#key-access-bip44-1-0');
+        await driver.delay(1000);
         await driver.clickElement({
           text: 'Confirm',
           tag: 'button',
diff --git a/test/e2e/snaps/test-snap-management.spec.js b/test/e2e/snaps/test-snap-management.spec.js
index 403bcc21c..e62e7c838 100644
--- a/test/e2e/snaps/test-snap-management.spec.js
+++ b/test/e2e/snaps/test-snap-management.spec.js
@@ -3,7 +3,7 @@ const { withFixtures } = require('../helpers');
 const FixtureBuilder = require('../fixture-builder');
 const { TEST_SNAPS_WEBSITE_URL } = require('./enums');
 
-describe('Test Snap onOff', function () {
+describe('Test Snap Management', function () {
   it('tests install disable enable and removal of a snap', async function () {
     const ganacheOptions = {
       accounts: [
diff --git a/test/e2e/snaps/test-snap-managestate.spec.js b/test/e2e/snaps/test-snap-managestate.spec.js
index 3bd925a77..8d3cc9028 100644
--- a/test/e2e/snaps/test-snap-managestate.spec.js
+++ b/test/e2e/snaps/test-snap-managestate.spec.js
@@ -30,7 +30,7 @@ describe('Test Snap manageState', function () {
         await driver.press('#password', driver.Key.ENTER);
 
         // navigate to test snaps page, then fill in the snapId
-        await driver.openNewPage(TEST_SNAPS_WEBSITE_URL);
+        await driver.driver.get(TEST_SNAPS_WEBSITE_URL);
         await driver.delay(1000);
 
         // find and scroll to the connect button and click it
@@ -41,7 +41,7 @@ describe('Test Snap manageState', function () {
 
         // switch to metamask extension and click connect
         let windowHandles = await driver.waitUntilXWindowHandles(
-          3,
+          2,
           1000,
           10000,
         );
@@ -59,7 +59,7 @@ describe('Test Snap manageState', function () {
         await driver.delay(2000);
 
         // approve install of snap
-        windowHandles = await driver.waitUntilXWindowHandles(3, 1000, 10000);
+        windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
         await driver.switchToWindowWithTitle(
           'MetaMask Notification',
           windowHandles,
@@ -70,9 +70,14 @@ describe('Test Snap manageState', function () {
         });
 
         // fill and click send inputs on test snap page
-        windowHandles = await driver.waitUntilXWindowHandles(2, 1000, 10000);
+        windowHandles = await driver.waitUntilXWindowHandles(1, 1000, 10000);
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
+        await driver.delay(1000);
         await driver.fill('#dataManageState', '23');
+        const snapButton2 = await driver.findElement(
+          '#retrieveManageStateResult',
+        );
+        await driver.scrollToElement(snapButton2);
         await driver.delay(1000);
         await driver.clickElement('#sendManageState');