diff --git a/test/end-to-end/mfa.chooserscreen.test.js b/test/end-to-end/mfa.chooserscreen.test.js
index d1cffa29c..27dc89713 100644
--- a/test/end-to-end/mfa.chooserscreen.test.js
+++ b/test/end-to-end/mfa.chooserscreen.test.js
@@ -87,9 +87,10 @@ describe("SuperTokens SignIn w/ MFA", function () {
     });
 
     after(async function () {
-        if (!skipped) {
-            await browser.close();
+        if (skipped) {
+            return;
         }
+        await browser.close();
 
         await fetch(`${TEST_SERVER_BASE_URL}/after`, {
             method: "POST",
diff --git a/test/end-to-end/mfa.factorscreen.otp.test.js b/test/end-to-end/mfa.factorscreen.otp.test.js
index cf6156f25..50ba660de 100644
--- a/test/end-to-end/mfa.factorscreen.otp.test.js
+++ b/test/end-to-end/mfa.factorscreen.otp.test.js
@@ -88,6 +88,9 @@ describe("SuperTokens SignIn w/ MFA", function () {
     });
 
     after(async function () {
+        if (skipped) {
+            return;
+        }
         await browser.close();
 
         await fetch(`${TEST_SERVER_BASE_URL}/after`, {
diff --git a/test/end-to-end/mfa.factorscreen.totp.test.js b/test/end-to-end/mfa.factorscreen.totp.test.js
index 8d03db832..5d9928d69 100644
--- a/test/end-to-end/mfa.factorscreen.totp.test.js
+++ b/test/end-to-end/mfa.factorscreen.totp.test.js
@@ -89,8 +89,9 @@ describe("SuperTokens SignIn w/ MFA", function () {
 
     after(async function () {
         if (skipped) {
-            await browser.close();
+            return;
         }
+        await browser.close();
 
         await fetch(`${TEST_SERVER_BASE_URL}/after`, {
             method: "POST",
diff --git a/test/end-to-end/mfa.requirement_handling.test.js b/test/end-to-end/mfa.requirement_handling.test.js
index 6bf2425e2..ad355de55 100644
--- a/test/end-to-end/mfa.requirement_handling.test.js
+++ b/test/end-to-end/mfa.requirement_handling.test.js
@@ -31,6 +31,7 @@ import {
     waitFor,
     getFactorChooserOptions,
     setAccountLinkingConfig,
+    isMFASupported,
 } from "../helpers";
 import fetch from "isomorphic-fetch";
 import { CREATE_CODE_API, CREATE_TOTP_DEVICE_API, MFA_INFO_API } from "../constants";
@@ -64,8 +65,14 @@ describe("SuperTokens SignIn w/ MFA", function () {
     let browser;
     let page;
     let consoleLogs = [];
+    let skipped;
 
     before(async function () {
+        if (!(await isMFASupported())) {
+            skipped = true;
+            this.skip();
+            return;
+        }
         await backendBeforeEach();
 
         await fetch(`${TEST_SERVER_BASE_URL}/startst`, {
@@ -79,6 +86,9 @@ describe("SuperTokens SignIn w/ MFA", function () {
     });
 
     after(async function () {
+        if (skipped) {
+            return;
+        }
         await browser.close();
 
         await fetch(`${TEST_SERVER_BASE_URL}/after`, {
diff --git a/test/server/package-lock.json b/test/server/package-lock.json
index b733400e3..11c529344 100644
--- a/test/server/package-lock.json
+++ b/test/server/package-lock.json
@@ -1041,8 +1041,8 @@
             "integrity": "sha512-r0JFBjkMIdep3Lbk3JA+MpnpuOtw4RSyrlRAbrzMcxwiYco3GFWl/daimQZ5b1forOiUODpOlXbSOljP/oyurg=="
         },
         "node_modules/supertokens-node": {
-            "version": "16.7.1",
-            "resolved": "git+ssh://git@github.com/supertokens/supertokens-node.git#a00ddd90b9fdaa36976b0e4f73711c7b253e08d3",
+            "version": "17.0.0",
+            "resolved": "git+ssh://git@github.com/supertokens/supertokens-node.git#52a5c69c9beac07e96afe071469de6ee61168d56",
             "license": "Apache-2.0",
             "dependencies": {
                 "content-type": "^1.0.5",
@@ -2013,7 +2013,7 @@
             "integrity": "sha512-r0JFBjkMIdep3Lbk3JA+MpnpuOtw4RSyrlRAbrzMcxwiYco3GFWl/daimQZ5b1forOiUODpOlXbSOljP/oyurg=="
         },
         "supertokens-node": {
-            "version": "git+ssh://git@github.com/supertokens/supertokens-node.git#a00ddd90b9fdaa36976b0e4f73711c7b253e08d3",
+            "version": "git+ssh://git@github.com/supertokens/supertokens-node.git#52a5c69c9beac07e96afe071469de6ee61168d56",
             "from": "supertokens-node@github:supertokens/supertokens-node#17.0",
             "requires": {
                 "content-type": "^1.0.5",