diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/pages/404-navigate/input/pages/_error.tsx b/packages/next-swc/crates/next-dev-tests/tests/integration/next/pages/404-navigate/input/pages/_error.tsx
deleted file mode 100644
index 44ee917818d51..0000000000000
--- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/pages/404-navigate/input/pages/_error.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { useTestHarness } from '@turbo/pack-test-harness'
-
-export default function ErrorPage(props: { static: 'static' }) {
-  useTestHarness((harness) => harness.markAsHydrated())
-
-  return <div data-test-error>{props.static}</div>
-}
-
-export function getStaticProps() {
-  return {
-    props: {
-      static: 'static',
-    },
-  }
-}
diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/pages/404-navigate/input/pages/index.tsx b/packages/next-swc/crates/next-dev-tests/tests/integration/next/pages/404-navigate/input/pages/index.tsx
deleted file mode 100644
index e73498717980c..0000000000000
--- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/pages/404-navigate/input/pages/index.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { useRef } from 'react'
-import { Harness, useTestHarness } from '@turbo/pack-test-harness'
-
-export default function Page() {
-  const iframeRef = useRef<HTMLIFrameElement | null>(null)
-
-  useTestHarness((harness) => runTests(harness, iframeRef.current!))
-
-  return (
-    <iframe style={{ width: 800, height: 600 }} src="/link" ref={iframeRef} />
-  )
-}
-
-function runTests(harness: Harness, iframe: HTMLIFrameElement) {
-  // These tests requires a longer timeout because we're rendering the 404 page as well.
-  const TIMEOUT = 20000
-
-  it(
-    'returns a 404 status code',
-    async () => {
-      const res = await fetch('/not-found')
-      expect(res.status).toBe(404)
-    },
-    TIMEOUT
-  )
-
-  it(
-    'navigates to the 404 page',
-    async () => {
-      await harness.waitForHydration(iframe, '/link')
-
-      const link = iframe.contentDocument!.querySelector('a[data-test-link]')
-      expect(link).not.toBeNull()
-      expect(link!).toBeInstanceOf(
-        (iframe.contentWindow as any).HTMLAnchorElement
-      )
-      expect(link!.textContent).toBe('Not found')
-      ;(link as HTMLAnchorElement).click()
-
-      await harness.waitForHydration(iframe, '/not-found')
-
-      const error = iframe.contentDocument!.querySelector('[data-test-error]')
-      expect(error).not.toBeNull()
-      expect(error!.textContent).toBe('static')
-    },
-    TIMEOUT
-  )
-}
diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/pages/404-navigate/input/pages/link.tsx b/packages/next-swc/crates/next-dev-tests/tests/integration/next/pages/404-navigate/input/pages/link.tsx
deleted file mode 100644
index 60fc464c03679..0000000000000
--- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/pages/404-navigate/input/pages/link.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import Link from 'next/link'
-import { useTestHarness } from '@turbo/pack-test-harness'
-
-export default function Page() {
-  useTestHarness((mod) => mod.markAsHydrated())
-
-  return (
-    <Link href="/not-found" data-test-link>
-      Not found
-    </Link>
-  )
-}
diff --git a/packages/next-swc/crates/next-dev-tests/tests/integration/next/pages/404-navigate/input/pages/not-found.tsx b/packages/next-swc/crates/next-dev-tests/tests/integration/next/pages/404-navigate/input/pages/not-found.tsx
deleted file mode 100644
index ece0c72f0aef7..0000000000000
--- a/packages/next-swc/crates/next-dev-tests/tests/integration/next/pages/404-navigate/input/pages/not-found.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-export default function Page() {
-  return <div>Page</div>
-}
-
-export function getStaticProps() {
-  return {
-    notFound: true,
-  }
-}
diff --git a/test/turbopack-tests-manifest.js b/test/turbopack-tests-manifest.js
index 19a43fb62de76..ca0064641cf65 100644
--- a/test/turbopack-tests-manifest.js
+++ b/test/turbopack-tests-manifest.js
@@ -109,6 +109,10 @@ const enabledTests = [
   'test/e2e/typescript-version-no-warning/typescript-version-no-warning.test.ts',
   'test/e2e/typescript-version-warning/typescript-version-warning.test.ts',
   'test/e2e/undici-fetch/index.test.ts',
+  'test/integration/404-page/test/index.test.js',
+  'test/integration/404-page-app/test/index.test.js',
+  'test/integration/404-page-custom-error/test/index.test.js',
+  'test/integration/404-page-ssg/test/index.test.js',
   'test/integration/create-next-app/templates-app.test.ts',
   'test/integration/create-next-app/templates-pages.test.ts',
   'test/integration/custom-routes-i18n-index-redirect/test/index.test.js',