diff --git a/tests/e2e-skip-retry.json b/tests/e2e-skip-retry.json
index f1f63e52a2..a555067ad6 100644
--- a/tests/e2e-skip-retry.json
+++ b/tests/e2e-skip-retry.json
@@ -29,6 +29,8 @@
   "test/e2e/app-dir/revalidate-dynamic/revalidate-dynamic.test.ts",
   "test/e2e/app-dir/rsc-basic/rsc-basic.test.ts",
   "test/e2e/basepath.test.ts",
+  "test/e2e/basepath/basepath.test.ts",
+  "test/e2e/basepath/error-pages.test.ts",
   "test/e2e/getserversideprops/test/index.test.ts",
   "test/e2e/middleware-general/test/index.test.ts",
   "test/e2e/module-layer/index.test.ts",
diff --git a/tests/test-config.json b/tests/test-config.json
index 0a5fcf9d52..4a8766300a 100644
--- a/tests/test-config.json
+++ b/tests/test-config.json
@@ -209,6 +209,7 @@
       ]
     },
     {
+      "//": "These tests were in this file before v15.4.0-canary.32 extracted them to a new file",
       "file": "test/e2e/basepath/basepath.test.ts",
       "reason": "Hard-coded expectation of Vercel's default 404 page",
       "tests": [
@@ -217,6 +218,14 @@
         "basePath should show 404 for page not under the /docs prefix"
       ]
     },
+    {
+      "file": "test/e2e/basepath/error-pages.test.ts",
+      "reason": "Hard-coded expectation of Vercel's default 404 page",
+      "tests": [
+        "basePath should not update URL for a 404",
+        "basePath should show 404 for page not under the /docs prefix"
+      ]
+    },
     {
       "file": "test/e2e/app-dir/app/index.test.ts",
       "reason": "Whitespace mismatch",