From f6018ce30471269b5baf7e71b52243a349af37a8 Mon Sep 17 00:00:00 2001
From: Michal Piechowiak <misiek.piechowiak@gmail.com>
Date: Wed, 26 Mar 2025 12:54:12 +0100
Subject: [PATCH 1/2] test: skip tests that rely on Vercel specific response
 headers

---
 tests/test-config.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/test-config.json b/tests/test-config.json
index a0af8773cf..ed1adfacea 100644
--- a/tests/test-config.json
+++ b/tests/test-config.json
@@ -362,6 +362,14 @@
     {
       "file": "test/e2e/next-config-warnings/esm-externals-false/esm-externals-false.test.ts",
       "reason": "Uses CLI output"
+    },
+    {
+      "file": "test/e2e/app-dir/app-root-params/generate-static-params.test.ts",
+      "reason": "Checking Vercel specific x-vercel-cache header",
+      "tests": [
+        "app-root-params - generateStaticParams should be a cache hit for fully prerendered pages",
+        "app-root-params - generateStaticParams should be a cache miss for pages that aren't prerendered"
+      ]
     }
   ],
   "failures": [

From da2dff5eb442607088d8e53a54e76397db81899a Mon Sep 17 00:00:00 2001
From: Michal Piechowiak <misiek.piechowiak@gmail.com>
Date: Wed, 26 Mar 2025 22:06:04 +0100
Subject: [PATCH 2/2] test: skip flaky test that check scroll behavior which is
 browser focused

---
 tests/e2e-skip-retry.json | 3 ++-
 tests/test-config.json    | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/e2e-skip-retry.json b/tests/e2e-skip-retry.json
index bdcdab3a55..f1f63e52a2 100644
--- a/tests/e2e-skip-retry.json
+++ b/tests/e2e-skip-retry.json
@@ -34,5 +34,6 @@
   "test/e2e/module-layer/index.test.ts",
   "test/e2e/prerender.test.ts",
   "test/e2e/react-compiler/react-compiler.test.ts",
-  "test/e2e/skip-trailing-slash-redirect/index.test.ts"
+  "test/e2e/skip-trailing-slash-redirect/index.test.ts",
+  "test/e2e/app-dir/router-autoscroll/router-autoscroll.test.ts"
 ]
diff --git a/tests/test-config.json b/tests/test-config.json
index ed1adfacea..8a3c016583 100644
--- a/tests/test-config.json
+++ b/tests/test-config.json
@@ -370,6 +370,13 @@
         "app-root-params - generateStaticParams should be a cache hit for fully prerendered pages",
         "app-root-params - generateStaticParams should be a cache miss for pages that aren't prerendered"
       ]
+    },
+    {
+      "file": "test/e2e/app-dir/router-autoscroll/router-autoscroll.test.ts",
+      "reason": "Test is very flaky, and seems to test mostly browser behavior",
+      "tests": [
+        "router autoscrolling on navigation bugs Should apply scroll when loading.js is used"
+      ]
     }
   ],
   "failures": [