diff --git a/packages/@apphosting/adapter-nextjs/e2e/app.spec.ts b/packages/@apphosting/adapter-nextjs/e2e/app.spec.ts
index 2cee8383..32647fba 100644
--- a/packages/@apphosting/adapter-nextjs/e2e/app.spec.ts
+++ b/packages/@apphosting/adapter-nextjs/e2e/app.spec.ts
@@ -12,20 +12,14 @@ describe("app", () => {
     const response = await fetch(host);
     assert.ok(response.ok);
     assert.equal(response.headers.get("content-type")?.toLowerCase(), "text/html; charset=utf-8");
-    assert.equal(
-      response.headers.get("cache-control"),
-      "s-maxage=31536000, stale-while-revalidate",
-    );
+    assert.equal(response.headers.get("cache-control"), "s-maxage=31536000, ");
   });
 
   it("/ssg", async () => {
     const response = await fetch(posix.join(host, "ssg"));
     assert.ok(response.ok);
     assert.equal(response.headers.get("content-type")?.toLowerCase(), "text/html; charset=utf-8");
-    assert.equal(
-      response.headers.get("cache-control"),
-      "s-maxage=31536000, stale-while-revalidate",
-    );
+    assert.equal(response.headers.get("cache-control"), "s-maxage=31536000, ");
     const text = await response.text();
     assert.ok(text.includes("SSG"));
     assert.ok(text.includes("Generated"));
@@ -80,10 +74,7 @@ describe("app", () => {
     const response = await fetch(posix.join(host, "isr", "demand"));
     assert.ok(response.ok);
     assert.equal(response.headers.get("content-type")?.toLowerCase(), "text/html; charset=utf-8");
-    assert.equal(
-      response.headers.get("cache-control"),
-      "s-maxage=31536000, stale-while-revalidate",
-    );
+    assert.equal(response.headers.get("cache-control"), "s-maxage=31536000, ");
     const text = await response.text();
     assert.ok(text.includes("A cached page"));
     assert.ok(text.includes("Generated"));
diff --git a/packages/@apphosting/adapter-nextjs/e2e/run-local.ts b/packages/@apphosting/adapter-nextjs/e2e/run-local.ts
index b85dd41e..2b4ae74b 100644
--- a/packages/@apphosting/adapter-nextjs/e2e/run-local.ts
+++ b/packages/@apphosting/adapter-nextjs/e2e/run-local.ts
@@ -70,6 +70,7 @@ const run = spawn(runScript, runArgs, {
   env: {
     NODE_ENV: "production",
     PORT: port.toString(),
+    PATH: process.env.PATH,
   },
 });
 run.stderr.on("data", (data) => console.error(data.toString()));
diff --git a/starters/nextjs/basic/.eslintrc.json b/starters/nextjs/basic/.eslintrc.json
deleted file mode 100644
index bffb357a..00000000
--- a/starters/nextjs/basic/.eslintrc.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "next/core-web-vitals"
-}
diff --git a/starters/nextjs/basic/eslint.config.mjs b/starters/nextjs/basic/eslint.config.mjs
new file mode 100644
index 00000000..b90088b2
--- /dev/null
+++ b/starters/nextjs/basic/eslint.config.mjs
@@ -0,0 +1,11 @@
+import { FlatCompat } from "@eslint/eslintrc";
+const compat = new FlatCompat({
+  // import.meta.dirname is available after Node.js v20.11.0
+  baseDirectory: import.meta.dirname,
+});
+const eslintConfig = [
+  ...compat.config({
+    extends: ["next/core-web-vitals"],
+  }),
+];
+export default eslintConfig;