diff --git a/test/end-to-end/generalerror.test.js b/test/end-to-end/generalerror.test.js
index c413b3c73..c65838c6a 100644
--- a/test/end-to-end/generalerror.test.js
+++ b/test/end-to-end/generalerror.test.js
@@ -63,7 +63,6 @@ let consoleLogs;
 
 describe("General error rendering", function () {
     let coreUrl;
-    let enabledRecipes = undefined;
     before(async function () {
         const _isGeneralErrorSupported = await isGeneralErrorSupported();
         if (!_isGeneralErrorSupported) {
@@ -77,7 +76,7 @@ describe("General error rendering", function () {
     beforeEach(async function () {
         await backendHook("beforeEach");
         coreUrl = await setupCoreApp();
-        await setupST({ coreUrl, enabledRecipes });
+        await setupST({ coreUrl });
         page = await browser.newPage();
 
         consoleLogs = [];
@@ -212,18 +211,11 @@ describe("General error rendering", function () {
     });
 
     describe("ThirdPartyEmailPassword", function () {
-        before(async function () {
-            enabledRecipes = ["thirdpartyemailpassword", "session"];
-        });
-
         getEmailPasswordTests("thirdpartyemailpassword", "THIRD_PARTY_EMAIL_PASSWORD");
         getThirdPartyTests("thirdpartyemailpassword", "THIRD_PARTY_EMAIL_PASSWORD");
     });
 
     describe("ThirdPartyPasswordless", function () {
-        before(async function () {
-            enabledRecipes = ["thirdpartypasswordless", "session"];
-        });
         getThirdPartyTests("thirdpartypasswordless", "THIRD_PARTY_PASSWORDLESS");
     });
 
diff --git a/test/end-to-end/getRedirectionURL.test.js b/test/end-to-end/getRedirectionURL.test.js
index 9b0e36ed2..3d40ca801 100644
--- a/test/end-to-end/getRedirectionURL.test.js
+++ b/test/end-to-end/getRedirectionURL.test.js
@@ -23,7 +23,6 @@ import { TEST_CLIENT_BASE_URL, SIGN_IN_UP_API } from "../constants";
 
 describe("getRedirectionURL Tests", function () {
     let browser;
-    let page;
 
     before(async function () {
         await backendHook("before");
@@ -46,6 +45,8 @@ describe("getRedirectionURL Tests", function () {
 
     describe("Test that isNewRecipeUser is passed correctly", function () {
         describe("Email Password Recipe", function () {
+            let page;
+
             beforeEach(async function () {
                 page = await browser.newPage();
                 const coreUrl = await setupCoreApp();
@@ -72,6 +73,8 @@ describe("getRedirectionURL Tests", function () {
         });
 
         describe("Third party recipe", function () {
+            let page;
+
             before(async function () {
                 const coreUrl = await setupCoreApp();
                 await setupST({ coreUrl });
@@ -105,6 +108,8 @@ describe("getRedirectionURL Tests", function () {
         });
 
         describe("Thirdpartyemailpassword recipe", function () {
+            let page;
+
             before(async function () {
                 const coreUrl = await setupCoreApp();
                 await setupST({ coreUrl });
@@ -145,6 +150,7 @@ describe("getRedirectionURL Tests", function () {
 
         describe("Passwordless recipe", function () {
             const exampleEmail = "test@example.com";
+            let page;
 
             before(async function () {
                 let _isPasswordlessSupported = await isPasswordlessSupported();
@@ -207,6 +213,7 @@ describe("getRedirectionURL Tests", function () {
 
         describe("ThirdPartyPasswordless recipe", function () {
             const exampleEmail = "test@example.com";
+            let page;
 
             before(async function () {
                 let _isThirdPartyPasswordlessSupported = await isThirdPartyPasswordlessSupported();
@@ -283,6 +290,8 @@ describe("getRedirectionURL Tests", function () {
 
         describe("No Redirection", function () {
             describe("Email Password Recipe", function () {
+                let page;
+
                 before(async function () {
                     const coreUrl = await setupCoreApp();
                     await setupST({ coreUrl });
@@ -320,6 +329,7 @@ describe("getRedirectionURL Tests", function () {
 
             describe("Passwordless recipe", function () {
                 const exampleEmail = "test@example.com";
+                let page;
 
                 before(async function () {
                     let _isPasswordlessSupported = await isPasswordlessSupported();
@@ -387,6 +397,7 @@ describe("getRedirectionURL Tests", function () {
 
             describe("ThirdPartyPasswordless recipe: Magic Link", function () {
                 const exampleEmail = "test@example.com";
+                let page;
 
                 before(async function () {
                     let _isThirdPartyPasswordlessSupported = await isThirdPartyPasswordlessSupported();
@@ -453,6 +464,7 @@ describe("getRedirectionURL Tests", function () {
             });
 
             describe("ThirdParty Recipe", function () {
+                let page;
                 before(async function () {
                     const coreUrl = await setupCoreApp();
                     await setupST({ coreUrl });
diff --git a/test/end-to-end/thirdpartyemailpassword.test.js b/test/end-to-end/thirdpartyemailpassword.test.js
index 8918d197e..16a609e8d 100644
--- a/test/end-to-end/thirdpartyemailpassword.test.js
+++ b/test/end-to-end/thirdpartyemailpassword.test.js
@@ -49,6 +49,7 @@ import {
     backendHook,
     setupCoreApp,
     setupST,
+    isThirdPartyEmailPasswordSupported,
 } from "../helpers";
 import {
     TEST_CLIENT_BASE_URL,
@@ -71,6 +72,10 @@ describe("SuperTokens Third Party Email Password", function () {
     const appConfig = {};
 
     before(async function () {
+        if (!(await isThirdPartyEmailPasswordSupported())) {
+            this.skip();
+        }
+
         await backendHook("before");
         const coreUrl = await setupCoreApp();
         appConfig.coreUrl = coreUrl;
diff --git a/test/helpers.js b/test/helpers.js
index a9478657e..8579415a7 100644
--- a/test/helpers.js
+++ b/test/helpers.js
@@ -961,6 +961,15 @@ export async function isThirdPartyPasswordlessSupported() {
     return false;
 }
 
+export async function isThirdPartyEmailPasswordSupported() {
+    const features = await getFeatureFlags();
+    if (features.includes("thirdpartyemailpassword")) {
+        return true;
+    }
+
+    return false;
+}
+
 export async function isUserRolesSupported() {
     const features = await getFeatureFlags();
     if (!features.includes("userroles")) {