diff --git a/test/e2e/app-dir/app/app/client-component-route/page.client.js b/test/e2e/app-dir/app/app/client-component-route/page.client.js
index 94406195d176..5e2c815adf49 100644
--- a/test/e2e/app-dir/app/app/client-component-route/page.client.js
+++ b/test/e2e/app-dir/app/app/client-component-route/page.client.js
@@ -1,3 +1,5 @@
+'client'
+
 import { useState, useEffect } from 'react'
 
 import style from './style.module.css'
diff --git a/test/e2e/app-dir/app/app/client-nested/layout.client.js b/test/e2e/app-dir/app/app/client-nested/layout.client.js
index c1639af225e7..506d2370b6e3 100644
--- a/test/e2e/app-dir/app/app/client-nested/layout.client.js
+++ b/test/e2e/app-dir/app/app/client-nested/layout.client.js
@@ -1,3 +1,5 @@
+'client'
+
 import { useState, useEffect } from 'react'
 
 import styles from './style.module.css'
diff --git a/test/e2e/app-dir/app/app/client-with-errors/get-server-side-props/page.client.js b/test/e2e/app-dir/app/app/client-with-errors/get-server-side-props/page.client.js
index 899f4d9b0697..8ea1ccd88990 100644
--- a/test/e2e/app-dir/app/app/client-with-errors/get-server-side-props/page.client.js
+++ b/test/e2e/app-dir/app/app/client-with-errors/get-server-side-props/page.client.js
@@ -1,3 +1,5 @@
+'client'
+
 // export function getServerSideProps() { { props: {} } }
 
 export default function Page() {
diff --git a/test/e2e/app-dir/app/app/client-with-errors/get-static-props/page.client.js b/test/e2e/app-dir/app/app/client-with-errors/get-static-props/page.client.js
index 717782b1a38e..70911d5f16fb 100644
--- a/test/e2e/app-dir/app/app/client-with-errors/get-static-props/page.client.js
+++ b/test/e2e/app-dir/app/app/client-with-errors/get-static-props/page.client.js
@@ -1,3 +1,5 @@
+'client'
+
 // export function getStaticProps() { return { props: {} }}
 
 export default function Page() {
diff --git a/test/e2e/app-dir/app/app/css/css-client/layout.client.js b/test/e2e/app-dir/app/app/css/css-client/layout.client.js
index 2add562cce69..ab9641929819 100644
--- a/test/e2e/app-dir/app/app/css/css-client/layout.client.js
+++ b/test/e2e/app-dir/app/app/css/css-client/layout.client.js
@@ -1,3 +1,5 @@
+'client'
+
 import './client-layout.css'
 
 import Foo from './foo'
diff --git a/test/e2e/app-dir/app/app/css/css-client/page.client.js b/test/e2e/app-dir/app/app/css/css-client/page.client.js
index 24df05926ff9..1e92db88c592 100644
--- a/test/e2e/app-dir/app/app/css/css-client/page.client.js
+++ b/test/e2e/app-dir/app/app/css/css-client/page.client.js
@@ -1,3 +1,5 @@
+'client'
+
 import './client-page.css'
 
 export default function Page() {
diff --git a/test/e2e/app-dir/app/app/css/css-nested/layout.client.js b/test/e2e/app-dir/app/app/css/css-nested/layout.client.js
index 8e132c3b51a9..8f2a9f56ada6 100644
--- a/test/e2e/app-dir/app/app/css/css-nested/layout.client.js
+++ b/test/e2e/app-dir/app/app/css/css-nested/layout.client.js
@@ -1,3 +1,5 @@
+'client'
+
 import './style.css'
 import styles from './style.module.css'
 
diff --git a/test/e2e/app-dir/app/app/css/css-nested/page.client.js b/test/e2e/app-dir/app/app/css/css-nested/page.client.js
index c17431379f96..baf7462f9d6a 100644
--- a/test/e2e/app-dir/app/app/css/css-nested/page.client.js
+++ b/test/e2e/app-dir/app/app/css/css-nested/page.client.js
@@ -1,3 +1,5 @@
+'client'
+
 export default function Page() {
   return null
 }
diff --git a/test/e2e/app-dir/app/app/dashboard/client-comp.client.jsx b/test/e2e/app-dir/app/app/dashboard/client-comp.client.jsx
index cabed435eada..79c317369816 100644
--- a/test/e2e/app-dir/app/app/dashboard/client-comp.client.jsx
+++ b/test/e2e/app-dir/app/app/dashboard/client-comp.client.jsx
@@ -1,3 +1,5 @@
+'client'
+
 import styles from './client-comp.module.css'
 
 import { useEffect, useState } from 'react'
diff --git a/test/e2e/app-dir/app/app/dashboard/index/dynamic-imports/dynamic.client.js b/test/e2e/app-dir/app/app/dashboard/index/dynamic-imports/dynamic.client.js
index 8b487da2a4eb..ccaf16110d81 100644
--- a/test/e2e/app-dir/app/app/dashboard/index/dynamic-imports/dynamic.client.js
+++ b/test/e2e/app-dir/app/app/dashboard/index/dynamic-imports/dynamic.client.js
@@ -1,3 +1,5 @@
+'client'
+
 import dynamic from 'next/dist/client/components/shared/dynamic'
 
 const Dynamic = dynamic(() => import('../text-dynamic.client'))
diff --git a/test/e2e/app-dir/app/app/dashboard/index/dynamic-imports/react-lazy.client.js b/test/e2e/app-dir/app/app/dashboard/index/dynamic-imports/react-lazy.client.js
index 0b1870fdeaf9..85727b55afd7 100644
--- a/test/e2e/app-dir/app/app/dashboard/index/dynamic-imports/react-lazy.client.js
+++ b/test/e2e/app-dir/app/app/dashboard/index/dynamic-imports/react-lazy.client.js
@@ -1,3 +1,5 @@
+'client'
+
 import { useState, lazy } from 'react'
 
 const Lazy = lazy(() => import('../text-lazy.client.js'))
diff --git a/test/e2e/app-dir/app/app/dashboard/index/text-dynamic.client.js b/test/e2e/app-dir/app/app/dashboard/index/text-dynamic.client.js
index 660b8c5953c6..6661c55534fc 100644
--- a/test/e2e/app-dir/app/app/dashboard/index/text-dynamic.client.js
+++ b/test/e2e/app-dir/app/app/dashboard/index/text-dynamic.client.js
@@ -1,3 +1,5 @@
+'client'
+
 import { useState } from 'react'
 import styles from './dynamic.module.css'
 
diff --git a/test/e2e/app-dir/app/app/dashboard/index/text-lazy.client.js b/test/e2e/app-dir/app/app/dashboard/index/text-lazy.client.js
index 1c225c38b190..ead59b0aa230 100644
--- a/test/e2e/app-dir/app/app/dashboard/index/text-lazy.client.js
+++ b/test/e2e/app-dir/app/app/dashboard/index/text-lazy.client.js
@@ -1,3 +1,5 @@
+'client'
+
 import styles from './lazy.module.css'
 
 export default function LazyComponent() {
diff --git a/test/e2e/app-dir/app/app/error/clientcomponent/error.client.js b/test/e2e/app-dir/app/app/error/clientcomponent/error.client.js
index cc0c3b620bfd..57ad9184f1f8 100644
--- a/test/e2e/app-dir/app/app/error/clientcomponent/error.client.js
+++ b/test/e2e/app-dir/app/app/error/clientcomponent/error.client.js
@@ -1,3 +1,5 @@
+'client'
+
 export default function ErrorBoundary({ error, reset }) {
   return (
     <>
diff --git a/test/e2e/app-dir/app/app/error/clientcomponent/page.client.js b/test/e2e/app-dir/app/app/error/clientcomponent/page.client.js
index 8c3fe1a72901..5f4e73da9dc1 100644
--- a/test/e2e/app-dir/app/app/error/clientcomponent/page.client.js
+++ b/test/e2e/app-dir/app/app/error/clientcomponent/page.client.js
@@ -1,3 +1,5 @@
+'client'
+
 import { useState } from 'react'
 
 export default function Page() {
diff --git a/test/e2e/app-dir/app/app/error/ssr-error-client-component/page.client.js b/test/e2e/app-dir/app/app/error/ssr-error-client-component/page.client.js
index 1cca8f6810c8..7743a313b475 100644
--- a/test/e2e/app-dir/app/app/error/ssr-error-client-component/page.client.js
+++ b/test/e2e/app-dir/app/app/error/ssr-error-client-component/page.client.js
@@ -1,3 +1,5 @@
+'client'
+
 export default function Page() {
   throw new Error('Error during SSR')
 }
diff --git a/test/e2e/app-dir/app/app/hooks/use-cookies/client/page.client.js b/test/e2e/app-dir/app/app/hooks/use-cookies/client/page.client.js
index 36e5fbb96f9f..e387b365aa2c 100644
--- a/test/e2e/app-dir/app/app/hooks/use-cookies/client/page.client.js
+++ b/test/e2e/app-dir/app/app/hooks/use-cookies/client/page.client.js
@@ -1,3 +1,5 @@
+'client'
+
 import { useCookies } from 'next/dist/client/components/hooks-server'
 
 export default function Page() {
diff --git a/test/e2e/app-dir/app/app/hooks/use-headers/client/page.client.js b/test/e2e/app-dir/app/app/hooks/use-headers/client/page.client.js
index 9fb9b875af8a..022da1e08a93 100644
--- a/test/e2e/app-dir/app/app/hooks/use-headers/client/page.client.js
+++ b/test/e2e/app-dir/app/app/hooks/use-headers/client/page.client.js
@@ -1,3 +1,5 @@
+'client'
+
 import { useHeaders } from 'next/dist/client/components/hooks-server'
 
 export default function Page() {
diff --git a/test/e2e/app-dir/app/app/hooks/use-pathname/page.client.js b/test/e2e/app-dir/app/app/hooks/use-pathname/page.client.js
index 8aa409b3dd0a..fa8350a8533a 100644
--- a/test/e2e/app-dir/app/app/hooks/use-pathname/page.client.js
+++ b/test/e2e/app-dir/app/app/hooks/use-pathname/page.client.js
@@ -1,3 +1,5 @@
+'client'
+
 import { usePathname } from 'next/dist/client/components/hooks-client'
 
 export default function Page() {
diff --git a/test/e2e/app-dir/app/app/hooks/use-preview-data/client/page.client.js b/test/e2e/app-dir/app/app/hooks/use-preview-data/client/page.client.js
index 094c66773e73..86fbc8fe7e2e 100644
--- a/test/e2e/app-dir/app/app/hooks/use-preview-data/client/page.client.js
+++ b/test/e2e/app-dir/app/app/hooks/use-preview-data/client/page.client.js
@@ -1,3 +1,5 @@
+'client'
+
 import { usePreviewData } from 'next/dist/client/components/hooks-server'
 
 export default function Page() {
diff --git a/test/e2e/app-dir/app/app/hooks/use-router/page.client.js b/test/e2e/app-dir/app/app/hooks/use-router/page.client.js
index 844c53fe1e4f..51a14d940b8b 100644
--- a/test/e2e/app-dir/app/app/hooks/use-router/page.client.js
+++ b/test/e2e/app-dir/app/app/hooks/use-router/page.client.js
@@ -1,3 +1,5 @@
+'client'
+
 import { useRouter } from 'next/dist/client/components/hooks-client'
 
 export default function Page() {
diff --git a/test/e2e/app-dir/app/app/hooks/use-router/sub-page/page.client.js b/test/e2e/app-dir/app/app/hooks/use-router/sub-page/page.client.js
index 14c197c67f46..82c6347e59fb 100644
--- a/test/e2e/app-dir/app/app/hooks/use-router/sub-page/page.client.js
+++ b/test/e2e/app-dir/app/app/hooks/use-router/sub-page/page.client.js
@@ -1,3 +1,5 @@
+'client'
+
 export default function Page() {
   return <h1 id="router-sub-page">hello from /hooks/use-router/sub-page</h1>
 }
diff --git a/test/e2e/app-dir/app/app/navigation/link.client.js b/test/e2e/app-dir/app/app/navigation/link.client.js
index 545e4e9b8464..5c1a21d1cccc 100644
--- a/test/e2e/app-dir/app/app/navigation/link.client.js
+++ b/test/e2e/app-dir/app/app/navigation/link.client.js
@@ -1,3 +1,5 @@
+'client'
+
 import { useRouter } from 'next/dist/client/components/hooks-client'
 import React from 'react'
 import { useEffect } from 'react'
diff --git a/test/e2e/app-dir/app/app/old-router/Router.client.js b/test/e2e/app-dir/app/app/old-router/Router.client.js
index aaec667cb52d..a33b07f8da42 100644
--- a/test/e2e/app-dir/app/app/old-router/Router.client.js
+++ b/test/e2e/app-dir/app/app/old-router/Router.client.js
@@ -1,3 +1,5 @@
+'client'
+
 import { useRouter, withRouter } from 'next/router'
 import IsNull from './IsNull'
 
diff --git a/test/e2e/app-dir/app/app/param-and-query/[slug]/page.client.js b/test/e2e/app-dir/app/app/param-and-query/[slug]/page.client.js
index b564508deb0c..c77875185947 100644
--- a/test/e2e/app-dir/app/app/param-and-query/[slug]/page.client.js
+++ b/test/e2e/app-dir/app/app/param-and-query/[slug]/page.client.js
@@ -1,3 +1,5 @@
+'client'
+
 export default function Page({ params, searchParams }) {
   return (
     <h1
diff --git a/test/e2e/app-dir/app/app/should-not-serve-client/page.client.js b/test/e2e/app-dir/app/app/should-not-serve-client/page.client.js
index 99bedbc90dd4..8ff1c2515684 100644
--- a/test/e2e/app-dir/app/app/should-not-serve-client/page.client.js
+++ b/test/e2e/app-dir/app/app/should-not-serve-client/page.client.js
@@ -1,3 +1,5 @@
+'client'
+
 export default function ShouldNotServeClientDotJs(props) {
   return (
     <>
diff --git a/test/e2e/app-dir/app/app/template/clientcomponent/template.client.js b/test/e2e/app-dir/app/app/template/clientcomponent/template.client.js
index 3f9960433a4e..1af291539184 100644
--- a/test/e2e/app-dir/app/app/template/clientcomponent/template.client.js
+++ b/test/e2e/app-dir/app/app/template/clientcomponent/template.client.js
@@ -1,3 +1,5 @@
+'client'
+
 import { useState } from 'react'
 
 export default function Template({ children }) {