diff --git a/packages/create-next-app/templates/app-tw/js/next.config.js b/packages/create-next-app/templates/app-tw/js/next.config.js
index dafb0c88e9..767719fc4f 100644
--- a/packages/create-next-app/templates/app-tw/js/next.config.js
+++ b/packages/create-next-app/templates/app-tw/js/next.config.js
@@ -1,8 +1,4 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {
-  experimental: {
-    appDir: true,
-  },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/packages/create-next-app/templates/app-tw/ts/next.config.js b/packages/create-next-app/templates/app-tw/ts/next.config.js
index dafb0c88e9..767719fc4f 100644
--- a/packages/create-next-app/templates/app-tw/ts/next.config.js
+++ b/packages/create-next-app/templates/app-tw/ts/next.config.js
@@ -1,8 +1,4 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {
-  experimental: {
-    appDir: true,
-  },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/packages/create-next-app/templates/app/js/next.config.js b/packages/create-next-app/templates/app/js/next.config.js
index dafb0c88e9..767719fc4f 100644
--- a/packages/create-next-app/templates/app/js/next.config.js
+++ b/packages/create-next-app/templates/app/js/next.config.js
@@ -1,8 +1,4 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {
-  experimental: {
-    appDir: true,
-  },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/packages/create-next-app/templates/app/ts/next.config.js b/packages/create-next-app/templates/app/ts/next.config.js
index dafb0c88e9..767719fc4f 100644
--- a/packages/create-next-app/templates/app/ts/next.config.js
+++ b/packages/create-next-app/templates/app/ts/next.config.js
@@ -1,8 +1,4 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {
-  experimental: {
-    appDir: true,
-  },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/packages/next/src/cli/next-dev.ts b/packages/next/src/cli/next-dev.ts
index 8420e8db26..6ebb5adab0 100644
--- a/packages/next/src/cli/next-dev.ts
+++ b/packages/next/src/cli/next-dev.ts
@@ -8,7 +8,11 @@ import isError from '../lib/is-error'
 import { getProjectDir } from '../lib/get-project-dir'
 import { CONFIG_FILES, PHASE_DEVELOPMENT_SERVER } from '../shared/lib/constants'
 import path from 'path'
-import type { NextConfig, NextConfigComplete } from '../server/config-shared'
+import {
+  defaultConfig,
+  NextConfig,
+  NextConfigComplete,
+} from '../server/config-shared'
 import { traceGlobals } from '../trace/shared'
 import { Telemetry } from '../telemetry/storage'
 import loadConfig from '../server/config'
@@ -239,7 +243,9 @@ const nextDev: CliCommand = async (argv) => {
     const distDir = path.join(dir, rawNextConfig.distDir || '.next')
     const { pagesDir, appDir } = findPagesDir(
       dir,
-      !!rawNextConfig.experimental?.appDir
+      typeof rawNextConfig?.experimental?.appDir === 'undefined'
+        ? !!defaultConfig.experimental?.appDir
+        : !!rawNextConfig.experimental?.appDir
     )
     const telemetry = new Telemetry({
       distDir,
diff --git a/packages/next/src/lib/turbopack-warning.ts b/packages/next/src/lib/turbopack-warning.ts
index 6f34c6695f..e207436859 100644
--- a/packages/next/src/lib/turbopack-warning.ts
+++ b/packages/next/src/lib/turbopack-warning.ts
@@ -120,7 +120,7 @@ export async function validateTurboNextConfig({
       let keys: string[] = []
 
       for (const key in obj) {
-        if (typeof obj[key] === 'undefined') {
+        if (typeof obj?.[key] === 'undefined') {
           continue
         }
 
@@ -145,9 +145,9 @@ export async function validateTurboNextConfig({
         keys = keys.split('.')
       }
       if (keys.length === 1) {
-        return obj[keys[0]]
+        return obj?.[keys?.[0]]
       }
-      return getDeepValue(obj[keys[0]], keys.slice(1))
+      return getDeepValue(obj?.[keys?.[0]], keys.slice(1))
     }
 
     const customKeys = flattenKeys(rawNextConfig)
diff --git a/packages/next/src/server/config.ts b/packages/next/src/server/config.ts
index b683d48c3d..4027458d74 100644
--- a/packages/next/src/server/config.ts
+++ b/packages/next/src/server/config.ts
@@ -135,17 +135,6 @@ function assignDefaults(
           for (const featureName of Object.keys(
             value
           ) as (keyof ExperimentalConfig)[]) {
-            const featureValue = value[featureName]
-            if (featureName === 'appDir' && featureValue === true) {
-              // auto enable clientRouterFilter if not manually set
-              // when appDir is enabled
-              if (
-                typeof userConfig.experimental.clientRouterFilter ===
-                'undefined'
-              ) {
-                userConfig.experimental.clientRouterFilter = true
-              }
-            }
             if (
               value[featureName] !== defaultConfig.experimental[featureName]
             ) {
@@ -456,6 +445,13 @@ function assignDefaults(
     silent
   )
 
+  if (
+    typeof userConfig.experimental?.clientRouterFilter === 'undefined' &&
+    result.experimental?.appDir
+  ) {
+    result.experimental.clientRouterFilter = true
+  }
+
   if (
     result.experimental?.outputFileTracingRoot &&
     !isAbsolute(result.experimental.outputFileTracingRoot)
diff --git a/test/.stats-app/next.config.js b/test/.stats-app/next.config.js
index 9544563de6..dc0c3a93b0 100644
--- a/test/.stats-app/next.config.js
+++ b/test/.stats-app/next.config.js
@@ -1,8 +1,4 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
 
 // For development: analyze the bundled chunks for stats app
 if (process.env.ANALYZE) {
diff --git a/test/development/acceptance-app/fixtures/app-hmr-changes/next.config.js b/test/development/acceptance-app/fixtures/app-hmr-changes/next.config.js
index c072d18d87..49a4699df1 100644
--- a/test/development/acceptance-app/fixtures/app-hmr-changes/next.config.js
+++ b/test/development/acceptance-app/fixtures/app-hmr-changes/next.config.js
@@ -3,7 +3,6 @@ const withMDX = require('@next/mdx')()
 module.exports = withMDX({
   pageExtensions: ['ts', 'tsx', 'js', 'jsx', 'md', 'mdx'],
   experimental: {
-    appDir: true,
     mdxRs: true,
   },
   images: {
diff --git a/test/development/acceptance-app/fixtures/default-template/next.config.js b/test/development/acceptance-app/fixtures/default-template/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/development/acceptance-app/fixtures/default-template/next.config.js
+++ b/test/development/acceptance-app/fixtures/default-template/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/development/acceptance-app/fixtures/rsc-build-errors/next.config.js b/test/development/acceptance-app/fixtures/rsc-build-errors/next.config.js
index 8e2a6c3691..4ba52ba2c8 100644
--- a/test/development/acceptance-app/fixtures/rsc-build-errors/next.config.js
+++ b/test/development/acceptance-app/fixtures/rsc-build-errors/next.config.js
@@ -1,3 +1 @@
-module.exports = {
-  experimental: { appDir: true },
-}
+module.exports = {}
diff --git a/test/development/app-dir/multiple-compiles-single-route/next.config.js b/test/development/app-dir/multiple-compiles-single-route/next.config.js
index bf49894afd..807126e4cf 100644
--- a/test/development/app-dir/multiple-compiles-single-route/next.config.js
+++ b/test/development/app-dir/multiple-compiles-single-route/next.config.js
@@ -1,8 +1,6 @@
 /**
  * @type {import('next').NextConfig}
  */
-const nextConfig = {
-  experimental: { appDir: true },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/test/development/app-hmr/next.config.js b/test/development/app-hmr/next.config.js
index d45ffa4488..eba9d47557 100644
--- a/test/development/app-hmr/next.config.js
+++ b/test/development/app-hmr/next.config.js
@@ -1,8 +1,4 @@
 /**
  * @type {import('next').NextConfig}
  */
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/development/app-render-error-log/next.config.js b/test/development/app-render-error-log/next.config.js
index 8e2a6c3691..4ba52ba2c8 100644
--- a/test/development/app-render-error-log/next.config.js
+++ b/test/development/app-render-error-log/next.config.js
@@ -1,3 +1 @@
-module.exports = {
-  experimental: { appDir: true },
-}
+module.exports = {}
diff --git a/test/development/basic/node-builtins/next.config.js b/test/development/basic/node-builtins/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/development/basic/node-builtins/next.config.js
+++ b/test/development/basic/node-builtins/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/development/next-font/build-errors/next.config.js b/test/development/next-font/build-errors/next.config.js
index 8e2a6c3691..4ba52ba2c8 100644
--- a/test/development/next-font/build-errors/next.config.js
+++ b/test/development/next-font/build-errors/next.config.js
@@ -1,3 +1 @@
-module.exports = {
-  experimental: { appDir: true },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir-legacy-edge-runtime-config/next.config.js b/test/e2e/app-dir-legacy-edge-runtime-config/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir-legacy-edge-runtime-config/next.config.js
+++ b/test/e2e/app-dir-legacy-edge-runtime-config/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/_allow-underscored-root-directory/next.config.js b/test/e2e/app-dir/_allow-underscored-root-directory/next.config.js
index bf49894afd..807126e4cf 100644
--- a/test/e2e/app-dir/_allow-underscored-root-directory/next.config.js
+++ b/test/e2e/app-dir/_allow-underscored-root-directory/next.config.js
@@ -1,8 +1,6 @@
 /**
  * @type {import('next').NextConfig}
  */
-const nextConfig = {
-  experimental: { appDir: true },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/test/e2e/app-dir/actions/next.config.js b/test/e2e/app-dir/actions/next.config.js
index e5415077f6..5940f6f70a 100644
--- a/test/e2e/app-dir/actions/next.config.js
+++ b/test/e2e/app-dir/actions/next.config.js
@@ -1,7 +1,6 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
   experimental: {
-    appDir: true,
     serverActions: true,
   },
 }
diff --git a/test/e2e/app-dir/app-a11y/next.config.js b/test/e2e/app-dir/app-a11y/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/app-a11y/next.config.js
+++ b/test/e2e/app-dir/app-a11y/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/app-alias/next.config.js b/test/e2e/app-dir/app-alias/next.config.js
index 3d6be3a00f..b1c6ea436a 100644
--- a/test/e2e/app-dir/app-alias/next.config.js
+++ b/test/e2e/app-dir/app-alias/next.config.js
@@ -1,5 +1 @@
-export default {
-  experimental: {
-    appDir: true,
-  },
-}
+export default {}
diff --git a/test/e2e/app-dir/app-basepath/next.config.js b/test/e2e/app-dir/app-basepath/next.config.js
index 3a1beb075a..1773c854e2 100644
--- a/test/e2e/app-dir/app-basepath/next.config.js
+++ b/test/e2e/app-dir/app-basepath/next.config.js
@@ -1,6 +1,3 @@
 module.exports = {
   basePath: '/base',
-  experimental: {
-    appDir: true,
-  },
 }
diff --git a/test/e2e/app-dir/app-client-cache/next.config.js b/test/e2e/app-dir/app-client-cache/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/app-client-cache/next.config.js
+++ b/test/e2e/app-dir/app-client-cache/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/app-css-pageextensions/next.config.js b/test/e2e/app-dir/app-css-pageextensions/next.config.js
index e71b0c96ba..d3e5e47e77 100644
--- a/test/e2e/app-dir/app-css-pageextensions/next.config.js
+++ b/test/e2e/app-dir/app-css-pageextensions/next.config.js
@@ -1,8 +1,5 @@
 const nextConfig = {
   pageExtensions: ['page.jsx', 'page.js'],
-  experimental: {
-    appDir: true,
-  },
 }
 
 module.exports = nextConfig
diff --git a/test/e2e/app-dir/app-css/next.config.js b/test/e2e/app-dir/app-css/next.config.js
index c179cd48ad..5aafd98508 100644
--- a/test/e2e/app-dir/app-css/next.config.js
+++ b/test/e2e/app-dir/app-css/next.config.js
@@ -5,7 +5,6 @@ const withMDX = mdx()
 const nextConfig = {
   pageExtensions: ['ts', 'tsx', 'js', 'jsx', 'md', 'mdx'],
   experimental: {
-    appDir: true,
     mdxRs: true,
   },
 }
diff --git a/test/e2e/app-dir/app-edge/next.config.js b/test/e2e/app-dir/app-edge/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/app-edge/next.config.js
+++ b/test/e2e/app-dir/app-edge/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/app-external/next.config.js b/test/e2e/app-dir/app-external/next.config.js
index 038b9aae03..8266249048 100644
--- a/test/e2e/app-dir/app-external/next.config.js
+++ b/test/e2e/app-dir/app-external/next.config.js
@@ -2,7 +2,6 @@ module.exports = {
   reactStrictMode: true,
   transpilePackages: ['untranspiled-module', 'css', 'font'],
   experimental: {
-    appDir: true,
     serverComponentsExternalPackages: ['conditional-exports-optout'],
   },
 }
diff --git a/test/e2e/app-dir/app-middleware/next.config.js b/test/e2e/app-dir/app-middleware/next.config.js
index fbffedab5b..265b3fb7e3 100644
--- a/test/e2e/app-dir/app-middleware/next.config.js
+++ b/test/e2e/app-dir/app-middleware/next.config.js
@@ -1,6 +1,5 @@
 module.exports = {
   experimental: {
-    appDir: true,
     clientRouterFilter: true,
     clientRouterFilterRedirects: true,
   },
diff --git a/test/e2e/app-dir/app-prefetch/next.config.js b/test/e2e/app-dir/app-prefetch/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/app-prefetch/next.config.js
+++ b/test/e2e/app-dir/app-prefetch/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/app-rendering/next.config.js b/test/e2e/app-dir/app-rendering/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/app-rendering/next.config.js
+++ b/test/e2e/app-dir/app-rendering/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/app-routes-trailing-slash/next.config.js b/test/e2e/app-dir/app-routes-trailing-slash/next.config.js
index 8767944ec5..b001860c3c 100644
--- a/test/e2e/app-dir/app-routes-trailing-slash/next.config.js
+++ b/test/e2e/app-dir/app-routes-trailing-slash/next.config.js
@@ -3,7 +3,6 @@
  */
 const nextConfig = {
   trailingSlash: true,
-  experimental: { appDir: true },
 }
 
 module.exports = nextConfig
diff --git a/test/e2e/app-dir/app-routes/next.config.js b/test/e2e/app-dir/app-routes/next.config.js
index f4f22ccbe0..79d95000de 100644
--- a/test/e2e/app-dir/app-routes/next.config.js
+++ b/test/e2e/app-dir/app-routes/next.config.js
@@ -2,9 +2,6 @@
  * @type {import('next').NextConfig}
  */
 module.exports = {
-  experimental: {
-    appDir: true,
-  },
   typescript: {
     ignoreBuildErrors: true,
   },
diff --git a/test/e2e/app-dir/app-static/next.config.js b/test/e2e/app-dir/app-static/next.config.js
index 8f06a19200..e45f5b4622 100644
--- a/test/e2e/app-dir/app-static/next.config.js
+++ b/test/e2e/app-dir/app-static/next.config.js
@@ -1,7 +1,6 @@
 /**@type import('next').NextConfig */
 module.exports = {
   experimental: {
-    appDir: true,
     incrementalCacheHandlerPath: process.env.CUSTOM_CACHE_HANDLER
       ? require.resolve('./cache-handler.js')
       : undefined,
diff --git a/test/e2e/app-dir/app-validation/next.config.js b/test/e2e/app-dir/app-validation/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/app-validation/next.config.js
+++ b/test/e2e/app-dir/app-validation/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/app/next.config.js b/test/e2e/app-dir/app/next.config.js
index 9b106f0052..cf006e7509 100644
--- a/test/e2e/app-dir/app/next.config.js
+++ b/test/e2e/app-dir/app/next.config.js
@@ -1,6 +1,5 @@
 module.exports = {
   experimental: {
-    appDir: true,
     clientRouterFilterRedirects: true,
     sri: {
       algorithm: 'sha256',
diff --git a/test/e2e/app-dir/asset-prefix/next.config.js b/test/e2e/app-dir/asset-prefix/next.config.js
index ad990b2ca5..0156b88bee 100644
--- a/test/e2e/app-dir/asset-prefix/next.config.js
+++ b/test/e2e/app-dir/asset-prefix/next.config.js
@@ -1,7 +1,4 @@
 module.exports = {
-  experimental: {
-    appDir: true,
-  },
   assetPrefix: '/assets',
   rewrites() {
     return {
diff --git a/test/e2e/app-dir/async-component-preload/next.config.js b/test/e2e/app-dir/async-component-preload/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/async-component-preload/next.config.js
+++ b/test/e2e/app-dir/async-component-preload/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/autoscroll-with-css-modules/next.config.js b/test/e2e/app-dir/autoscroll-with-css-modules/next.config.js
index de82fae3e7..0e5c476c94 100644
--- a/test/e2e/app-dir/autoscroll-with-css-modules/next.config.js
+++ b/test/e2e/app-dir/autoscroll-with-css-modules/next.config.js
@@ -1,5 +1,4 @@
 /** @type {import("next").NextConfig} */
 module.exports = {
   reactStrictMode: true,
-  experimental: { appDir: true },
 }
diff --git a/test/e2e/app-dir/back-button-download-bug/next.config.js b/test/e2e/app-dir/back-button-download-bug/next.config.js
index af770767c1..8ba5f4faab 100644
--- a/test/e2e/app-dir/back-button-download-bug/next.config.js
+++ b/test/e2e/app-dir/back-button-download-bug/next.config.js
@@ -1,9 +1,6 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
   reactStrictMode: true,
-  experimental: {
-    appDir: true,
-  },
   images: {
     domains: ['res.cloudinary.com', 'avatars.githubusercontent.com'],
   },
diff --git a/test/e2e/app-dir/create-next-app-template/next.config.js b/test/e2e/app-dir/create-next-app-template/next.config.js
index 80cbed7f8f..77abcb62bc 100644
--- a/test/e2e/app-dir/create-next-app-template/next.config.js
+++ b/test/e2e/app-dir/create-next-app-template/next.config.js
@@ -3,11 +3,7 @@ const withBundleAnalyzer = require('@next/bundle-analyzer')({
 })
 
 /** @type {import('next').NextConfig} */
-const nextConfig = {
-  experimental: {
-    appDir: true,
-  },
-}
+const nextConfig = {}
 
 // module.exports = nextConfig
 module.exports = withBundleAnalyzer(nextConfig)
diff --git a/test/e2e/app-dir/create-root-layout/next.config.js b/test/e2e/app-dir/create-root-layout/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/create-root-layout/next.config.js
+++ b/test/e2e/app-dir/create-root-layout/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/crypto-globally-available/next.config.js b/test/e2e/app-dir/crypto-globally-available/next.config.js
index bf49894afd..807126e4cf 100644
--- a/test/e2e/app-dir/crypto-globally-available/next.config.js
+++ b/test/e2e/app-dir/crypto-globally-available/next.config.js
@@ -1,8 +1,6 @@
 /**
  * @type {import('next').NextConfig}
  */
-const nextConfig = {
-  experimental: { appDir: true },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/test/e2e/app-dir/draft-mode/next.config.js b/test/e2e/app-dir/draft-mode/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/draft-mode/next.config.js
+++ b/test/e2e/app-dir/draft-mode/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/dynamic-href/next.config.js b/test/e2e/app-dir/dynamic-href/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/dynamic-href/next.config.js
+++ b/test/e2e/app-dir/dynamic-href/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/dynamic/next.config.js b/test/e2e/app-dir/dynamic/next.config.js
index 1c3c436e11..0d6071006a 100644
--- a/test/e2e/app-dir/dynamic/next.config.js
+++ b/test/e2e/app-dir/dynamic/next.config.js
@@ -1,6 +1,3 @@
 module.exports = {
   reactStrictMode: true,
-  experimental: {
-    appDir: true,
-  },
 }
diff --git a/test/e2e/app-dir/edge-runtime-node-compatibility/next.config.js b/test/e2e/app-dir/edge-runtime-node-compatibility/next.config.js
index bf49894afd..807126e4cf 100644
--- a/test/e2e/app-dir/edge-runtime-node-compatibility/next.config.js
+++ b/test/e2e/app-dir/edge-runtime-node-compatibility/next.config.js
@@ -1,8 +1,6 @@
 /**
  * @type {import('next').NextConfig}
  */
-const nextConfig = {
-  experimental: { appDir: true },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/test/e2e/app-dir/front-redirect-issue/next.config.js b/test/e2e/app-dir/front-redirect-issue/next.config.js
index 4eb545c13b..9ba0b4378e 100644
--- a/test/e2e/app-dir/front-redirect-issue/next.config.js
+++ b/test/e2e/app-dir/front-redirect-issue/next.config.js
@@ -1,8 +1,5 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  experimental: {
-    appDir: true,
-  },
   rewrites() {
     return {
       fallback: [
diff --git a/test/e2e/app-dir/global-error/next.config.js b/test/e2e/app-dir/global-error/next.config.js
index 8e2a6c3691..4ba52ba2c8 100644
--- a/test/e2e/app-dir/global-error/next.config.js
+++ b/test/e2e/app-dir/global-error/next.config.js
@@ -1,3 +1 @@
-module.exports = {
-  experimental: { appDir: true },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/hooks/next.config.js b/test/e2e/app-dir/hooks/next.config.js
index 7843d45c6d..5bd2129b61 100644
--- a/test/e2e/app-dir/hooks/next.config.js
+++ b/test/e2e/app-dir/hooks/next.config.js
@@ -1,7 +1,4 @@
 module.exports = {
-  experimental: {
-    appDir: true,
-  },
   rewrites: async () => {
     return {
       afterFiles: [
diff --git a/test/e2e/app-dir/i18n-hybrid/next.config.js b/test/e2e/app-dir/i18n-hybrid/next.config.js
index ff4afecc94..f5cdcd114d 100644
--- a/test/e2e/app-dir/i18n-hybrid/next.config.js
+++ b/test/e2e/app-dir/i18n-hybrid/next.config.js
@@ -3,7 +3,4 @@ module.exports = {
     defaultLocale: 'en-CA',
     locales: ['en-CA', 'en-US', 'fr-CA', 'fr-FR'],
   },
-  experimental: {
-    appDir: true,
-  },
 }
diff --git a/test/e2e/app-dir/import/next.config.js b/test/e2e/app-dir/import/next.config.js
index e31d8c63a6..53c8bdda51 100644
--- a/test/e2e/app-dir/import/next.config.js
+++ b/test/e2e/app-dir/import/next.config.js
@@ -1,6 +1,3 @@
 module.exports = {
   strictMode: true,
-  experimental: {
-    appDir: true,
-  },
 }
diff --git a/test/e2e/app-dir/interception-middleware-rewrite/next.config.js b/test/e2e/app-dir/interception-middleware-rewrite/next.config.js
index bf49894afd..807126e4cf 100644
--- a/test/e2e/app-dir/interception-middleware-rewrite/next.config.js
+++ b/test/e2e/app-dir/interception-middleware-rewrite/next.config.js
@@ -1,8 +1,6 @@
 /**
  * @type {import('next').NextConfig}
  */
-const nextConfig = {
-  experimental: { appDir: true },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/test/e2e/app-dir/interpolability-with-pages/next.config.js b/test/e2e/app-dir/interpolability-with-pages/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/interpolability-with-pages/next.config.js
+++ b/test/e2e/app-dir/interpolability-with-pages/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/layout-params/next.config.js b/test/e2e/app-dir/layout-params/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/layout-params/next.config.js
+++ b/test/e2e/app-dir/layout-params/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/mdx/next.config.js b/test/e2e/app-dir/mdx/next.config.js
index a7559e5fc2..4485a253ee 100644
--- a/test/e2e/app-dir/mdx/next.config.js
+++ b/test/e2e/app-dir/mdx/next.config.js
@@ -8,7 +8,6 @@ const withMDX = require('@next/mdx')({
 const nextConfig = {
   pageExtensions: ['js', 'jsx', 'ts', 'tsx', 'mdx'],
   experimental: {
-    appDir: true,
     mdxRs: process.env.WITH_MDX_RS === 'true',
   },
 }
diff --git a/test/e2e/app-dir/metadata-dynamic-routes/next.config.js b/test/e2e/app-dir/metadata-dynamic-routes/next.config.js
index 8e2a6c3691..4ba52ba2c8 100644
--- a/test/e2e/app-dir/metadata-dynamic-routes/next.config.js
+++ b/test/e2e/app-dir/metadata-dynamic-routes/next.config.js
@@ -1,3 +1 @@
-module.exports = {
-  experimental: { appDir: true },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/metadata-missing-metadata-base/next.config.js b/test/e2e/app-dir/metadata-missing-metadata-base/next.config.js
index 8e2a6c3691..4ba52ba2c8 100644
--- a/test/e2e/app-dir/metadata-missing-metadata-base/next.config.js
+++ b/test/e2e/app-dir/metadata-missing-metadata-base/next.config.js
@@ -1,3 +1 @@
-module.exports = {
-  experimental: { appDir: true },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/metadata-suspense/next.config.js b/test/e2e/app-dir/metadata-suspense/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/metadata-suspense/next.config.js
+++ b/test/e2e/app-dir/metadata-suspense/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/metadata/next.config.js b/test/e2e/app-dir/metadata/next.config.js
index 8e2a6c3691..4ba52ba2c8 100644
--- a/test/e2e/app-dir/metadata/next.config.js
+++ b/test/e2e/app-dir/metadata/next.config.js
@@ -1,3 +1 @@
-module.exports = {
-  experimental: { appDir: true },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/navigation/next.config.js b/test/e2e/app-dir/navigation/next.config.js
index 4b7ae1a9b6..8c96d7be65 100644
--- a/test/e2e/app-dir/navigation/next.config.js
+++ b/test/e2e/app-dir/navigation/next.config.js
@@ -1,7 +1,4 @@
 module.exports = {
-  experimental: {
-    appDir: true,
-  },
   redirects: () => {
     return [
       {
diff --git a/test/e2e/app-dir/next-font/next.config.js b/test/e2e/app-dir/next-font/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/next-font/next.config.js
+++ b/test/e2e/app-dir/next-font/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/next-image/next.config.js b/test/e2e/app-dir/next-image/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/next-image/next.config.js
+++ b/test/e2e/app-dir/next-image/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/not-found/next.config.js b/test/e2e/app-dir/not-found/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/not-found/next.config.js
+++ b/test/e2e/app-dir/not-found/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/pages-to-app-routing/next.config.js b/test/e2e/app-dir/pages-to-app-routing/next.config.js
index bf49894afd..807126e4cf 100644
--- a/test/e2e/app-dir/pages-to-app-routing/next.config.js
+++ b/test/e2e/app-dir/pages-to-app-routing/next.config.js
@@ -1,8 +1,6 @@
 /**
  * @type {import('next').NextConfig}
  */
-const nextConfig = {
-  experimental: { appDir: true },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/test/e2e/app-dir/parallel-routes-and-interception/next.config.js b/test/e2e/app-dir/parallel-routes-and-interception/next.config.js
index bf49894afd..807126e4cf 100644
--- a/test/e2e/app-dir/parallel-routes-and-interception/next.config.js
+++ b/test/e2e/app-dir/parallel-routes-and-interception/next.config.js
@@ -1,8 +1,6 @@
 /**
  * @type {import('next').NextConfig}
  */
-const nextConfig = {
-  experimental: { appDir: true },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/test/e2e/app-dir/parallel-routes-not-found/next.config.js b/test/e2e/app-dir/parallel-routes-not-found/next.config.js
index 358812ac96..3f1bcf9fbe 100644
--- a/test/e2e/app-dir/parallel-routes-not-found/next.config.js
+++ b/test/e2e/app-dir/parallel-routes-not-found/next.config.js
@@ -3,7 +3,6 @@
  */
 const nextConfig = {
   pageExtensions: ['tsx', 'ts'],
-  experimental: { appDir: true },
 }
 
 module.exports = nextConfig
diff --git a/test/e2e/app-dir/rewrites-redirects/next.config.js b/test/e2e/app-dir/rewrites-redirects/next.config.js
index bc7f7ab923..3d2bfadccf 100644
--- a/test/e2e/app-dir/rewrites-redirects/next.config.js
+++ b/test/e2e/app-dir/rewrites-redirects/next.config.js
@@ -1,8 +1,5 @@
 module.exports = {
   reactStrictMode: true,
-  experimental: {
-    appDir: true,
-  },
   async rewrites() {
     return [
       {
diff --git a/test/e2e/app-dir/root-layout-redirect/next.config.js b/test/e2e/app-dir/root-layout-redirect/next.config.js
index bf49894afd..807126e4cf 100644
--- a/test/e2e/app-dir/root-layout-redirect/next.config.js
+++ b/test/e2e/app-dir/root-layout-redirect/next.config.js
@@ -1,8 +1,6 @@
 /**
  * @type {import('next').NextConfig}
  */
-const nextConfig = {
-  experimental: { appDir: true },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/test/e2e/app-dir/root-layout/next.config.js b/test/e2e/app-dir/root-layout/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/root-layout/next.config.js
+++ b/test/e2e/app-dir/root-layout/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/route-page-manifest-bug/next.config.js b/test/e2e/app-dir/route-page-manifest-bug/next.config.js
index bf49894afd..807126e4cf 100644
--- a/test/e2e/app-dir/route-page-manifest-bug/next.config.js
+++ b/test/e2e/app-dir/route-page-manifest-bug/next.config.js
@@ -1,8 +1,6 @@
 /**
  * @type {import('next').NextConfig}
  */
-const nextConfig = {
-  experimental: { appDir: true },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/test/e2e/app-dir/router-autoscroll/next.config.js b/test/e2e/app-dir/router-autoscroll/next.config.js
index e31d8c63a6..53c8bdda51 100644
--- a/test/e2e/app-dir/router-autoscroll/next.config.js
+++ b/test/e2e/app-dir/router-autoscroll/next.config.js
@@ -1,6 +1,3 @@
 module.exports = {
   strictMode: true,
-  experimental: {
-    appDir: true,
-  },
 }
diff --git a/test/e2e/app-dir/router-stuck-dynamic-static-segment/next.config.js b/test/e2e/app-dir/router-stuck-dynamic-static-segment/next.config.js
index dafd16a825..09072dce25 100644
--- a/test/e2e/app-dir/router-stuck-dynamic-static-segment/next.config.js
+++ b/test/e2e/app-dir/router-stuck-dynamic-static-segment/next.config.js
@@ -3,7 +3,6 @@
  */
 const nextConfig = {
   reactStrictMode: true,
-  experimental: { appDir: true },
 }
 
 module.exports = nextConfig
diff --git a/test/e2e/app-dir/rsc-basic/next.config.js b/test/e2e/app-dir/rsc-basic/next.config.js
index df698a0883..9694085918 100644
--- a/test/e2e/app-dir/rsc-basic/next.config.js
+++ b/test/e2e/app-dir/rsc-basic/next.config.js
@@ -4,7 +4,6 @@ module.exports = {
     maxInactiveAge: 1000 * 60 * 60,
   },
   experimental: {
-    appDir: true,
     serverComponentsExternalPackages: ['conditional-exports-optout'],
   },
   rewrites: async () => {
diff --git a/test/e2e/app-dir/search-params-react-key/next.config.js b/test/e2e/app-dir/search-params-react-key/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/search-params-react-key/next.config.js
+++ b/test/e2e/app-dir/search-params-react-key/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/searchparams-static-bailout/next.config.js b/test/e2e/app-dir/searchparams-static-bailout/next.config.js
index bf49894afd..807126e4cf 100644
--- a/test/e2e/app-dir/searchparams-static-bailout/next.config.js
+++ b/test/e2e/app-dir/searchparams-static-bailout/next.config.js
@@ -1,8 +1,6 @@
 /**
  * @type {import('next').NextConfig}
  */
-const nextConfig = {
-  experimental: { appDir: true },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/test/e2e/app-dir/set-cookies/next.config.mjs b/test/e2e/app-dir/set-cookies/next.config.mjs
index be80ea961e..a91cb28547 100644
--- a/test/e2e/app-dir/set-cookies/next.config.mjs
+++ b/test/e2e/app-dir/set-cookies/next.config.mjs
@@ -9,7 +9,6 @@ const headers = nextConfigHeaders.map((header) => ({
  * @type {import('next').NextConfig}
  */
 const config = {
-  experimental: { appDir: true },
   async headers() {
     return [
       {
diff --git a/test/e2e/app-dir/similar-pages-paths/next.config.js b/test/e2e/app-dir/similar-pages-paths/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/similar-pages-paths/next.config.js
+++ b/test/e2e/app-dir/similar-pages-paths/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/test-template/{{ toFileName name }}/next.config.js b/test/e2e/app-dir/test-template/{{ toFileName name }}/next.config.js
index bf49894afd..807126e4cf 100644
--- a/test/e2e/app-dir/test-template/{{ toFileName name }}/next.config.js	
+++ b/test/e2e/app-dir/test-template/{{ toFileName name }}/next.config.js	
@@ -1,8 +1,6 @@
 /**
  * @type {import('next').NextConfig}
  */
-const nextConfig = {
-  experimental: { appDir: true },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/test/e2e/app-dir/trailingslash/next.config.js b/test/e2e/app-dir/trailingslash/next.config.js
index deef68c1b5..ce3f975d0e 100644
--- a/test/e2e/app-dir/trailingslash/next.config.js
+++ b/test/e2e/app-dir/trailingslash/next.config.js
@@ -1,6 +1,3 @@
 module.exports = {
-  experimental: {
-    appDir: true,
-  },
   trailingSlash: true,
 }
diff --git a/test/e2e/app-dir/underscore-ignore-app-paths/next.config.js b/test/e2e/app-dir/underscore-ignore-app-paths/next.config.js
index cc6f22d41f..3d24f68135 100644
--- a/test/e2e/app-dir/underscore-ignore-app-paths/next.config.js
+++ b/test/e2e/app-dir/underscore-ignore-app-paths/next.config.js
@@ -2,7 +2,6 @@
  * @type {import('next').NextConfig}
  */
 const nextConfig = {
-  experimental: { appDir: true },
   typescript: {
     ignoreBuildErrors: true,
   },
diff --git a/test/e2e/app-dir/use-params/next.config.js b/test/e2e/app-dir/use-params/next.config.js
index bf49894afd..807126e4cf 100644
--- a/test/e2e/app-dir/use-params/next.config.js
+++ b/test/e2e/app-dir/use-params/next.config.js
@@ -1,8 +1,6 @@
 /**
  * @type {import('next').NextConfig}
  */
-const nextConfig = {
-  experimental: { appDir: true },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/test/e2e/app-dir/use-selected-layout-segment-s/next.config.js b/test/e2e/app-dir/use-selected-layout-segment-s/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/use-selected-layout-segment-s/next.config.js
+++ b/test/e2e/app-dir/use-selected-layout-segment-s/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/app-dir/with-babel/next.config.js b/test/e2e/app-dir/with-babel/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/app-dir/with-babel/next.config.js
+++ b/test/e2e/app-dir/with-babel/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/edge-runtime-uses-edge-light-import-specifier-for-packages/next.config.js b/test/e2e/edge-runtime-uses-edge-light-import-specifier-for-packages/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/e2e/edge-runtime-uses-edge-light-import-specifier-for-packages/next.config.js
+++ b/test/e2e/edge-runtime-uses-edge-light-import-specifier-for-packages/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/og-api/app/next.config.js b/test/e2e/og-api/app/next.config.js
index c89f67b1f5..b6b4bc39ee 100644
--- a/test/e2e/og-api/app/next.config.js
+++ b/test/e2e/og-api/app/next.config.js
@@ -1,7 +1,4 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
   output: 'standalone',
-  experimental: {
-    appDir: true,
-  },
 }
diff --git a/test/e2e/opentelemetry/next.config.js b/test/e2e/opentelemetry/next.config.js
index 2c7924dfb8..c4cf84a765 100644
--- a/test/e2e/opentelemetry/next.config.js
+++ b/test/e2e/opentelemetry/next.config.js
@@ -1,6 +1,5 @@
 module.exports = {
   experimental: {
     instrumentationHook: true,
-    appDir: true,
   },
 }
diff --git a/test/e2e/switchable-runtime/next.config.js b/test/e2e/switchable-runtime/next.config.js
index b286c63398..a535147d49 100644
--- a/test/e2e/switchable-runtime/next.config.js
+++ b/test/e2e/switchable-runtime/next.config.js
@@ -1,9 +1,6 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
   reactStrictMode: true,
-  experimental: {
-    appDir: true,
-  },
   async rewrites() {
     return {
       afterFiles: [
diff --git a/test/integration/app-dir-export/next.config.js b/test/integration/app-dir-export/next.config.js
index fba540176b..307e966cb1 100644
--- a/test/integration/app-dir-export/next.config.js
+++ b/test/integration/app-dir-export/next.config.js
@@ -2,9 +2,6 @@
 const nextConfig = {
   output: 'export',
   trailingSlash: true,
-  experimental: {
-    appDir: true,
-  },
   generateBuildId() {
     return 'test-build-id'
   },
diff --git a/test/integration/app-dynamic-error/next.config.js b/test/integration/app-dynamic-error/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/integration/app-dynamic-error/next.config.js
+++ b/test/integration/app-dynamic-error/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/integration/app-types/next.config.js b/test/integration/app-types/next.config.js
index 9a66c0baf4..532ba96961 100644
--- a/test/integration/app-types/next.config.js
+++ b/test/integration/app-types/next.config.js
@@ -1,6 +1,5 @@
 export default {
   experimental: {
-    appDir: true,
     typedRoutes: true,
   },
   async rewrites() {
diff --git a/test/integration/conflicting-app-page-error/next.config.js b/test/integration/conflicting-app-page-error/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/integration/conflicting-app-page-error/next.config.js
+++ b/test/integration/conflicting-app-page-error/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/integration/eslint/with-typescript/next.config.js b/test/integration/eslint/with-typescript/next.config.js
index 0093142fc0..c559d2925c 100644
--- a/test/integration/eslint/with-typescript/next.config.js
+++ b/test/integration/eslint/with-typescript/next.config.js
@@ -1,6 +1,3 @@
 module.exports = {
-  experimental: {
-    appDir: true,
-  },
   distDir: '.build',
 }
diff --git a/test/integration/next-image-new/app-dir/next.config.js b/test/integration/next-image-new/app-dir/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/integration/next-image-new/app-dir/next.config.js
+++ b/test/integration/next-image-new/app-dir/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/integration/react-streaming/unsupported-native-module/next.config.js b/test/integration/react-streaming/unsupported-native-module/next.config.js
index e289c86fac..4ba52ba2c8 100644
--- a/test/integration/react-streaming/unsupported-native-module/next.config.js
+++ b/test/integration/react-streaming/unsupported-native-module/next.config.js
@@ -1,3 +1 @@
-module.exports = {
-  experimental: {},
-}
+module.exports = {}
diff --git a/test/production/app-dir-hide-suppressed-error-during-next-export/next.config.js b/test/production/app-dir-hide-suppressed-error-during-next-export/next.config.js
index 426499ce6d..d09bdc66ec 100644
--- a/test/production/app-dir-hide-suppressed-error-during-next-export/next.config.js
+++ b/test/production/app-dir-hide-suppressed-error-during-next-export/next.config.js
@@ -1,6 +1,4 @@
 /** @type {import("next").NextConfig} */
-const nextConfig = {
-  experimental: { appDir: true },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/test/production/app-dir-prefetch-non-iso-url/next.config.js b/test/production/app-dir-prefetch-non-iso-url/next.config.js
index 426499ce6d..d09bdc66ec 100644
--- a/test/production/app-dir-prefetch-non-iso-url/next.config.js
+++ b/test/production/app-dir-prefetch-non-iso-url/next.config.js
@@ -1,6 +1,4 @@
 /** @type {import("next").NextConfig} */
-const nextConfig = {
-  experimental: { appDir: true },
-}
+const nextConfig = {}
 
 module.exports = nextConfig
diff --git a/test/production/app-dir/app-only-flag/next.config.js b/test/production/app-dir/app-only-flag/next.config.js
index 8e2a6c3691..4ba52ba2c8 100644
--- a/test/production/app-dir/app-only-flag/next.config.js
+++ b/test/production/app-dir/app-only-flag/next.config.js
@@ -1,3 +1 @@
-module.exports = {
-  experimental: { appDir: true },
-}
+module.exports = {}
diff --git a/test/production/app-dir/revalidate/next.config.js b/test/production/app-dir/revalidate/next.config.js
index cfa3ac3d7a..4ba52ba2c8 100644
--- a/test/production/app-dir/revalidate/next.config.js
+++ b/test/production/app-dir/revalidate/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    appDir: true,
-  },
-}
+module.exports = {}
diff --git a/test/production/standalone-mode/metadata/next.config.js b/test/production/standalone-mode/metadata/next.config.js
index 221e04553a..e97173b4b3 100644
--- a/test/production/standalone-mode/metadata/next.config.js
+++ b/test/production/standalone-mode/metadata/next.config.js
@@ -1,6 +1,3 @@
 module.exports = {
   output: 'standalone',
-  experimental: {
-    appDir: true,
-  },
 }