diff --git a/packages/e2e/next/cypress/e2e/shared/basic-io.cy.ts b/packages/e2e/next/cypress/e2e/shared/basic-io.cy.ts
index b5d6de668..cea6c4a10 100644
--- a/packages/e2e/next/cypress/e2e/shared/basic-io.cy.ts
+++ b/packages/e2e/next/cypress/e2e/shared/basic-io.cy.ts
@@ -23,3 +23,19 @@ testBasicIO({
   path: '/pages/basic-io/useQueryStates',
   nextJsRouter: 'pages'
 })
+
+// Test the agnostic adapter
+
+testBasicIO({
+  hook: 'useQueryState',
+  path: '/app/agnostic/basic-io',
+  nextJsRouter: 'app',
+  description: 'Agnostic adapter'
+})
+
+testBasicIO({
+  hook: 'useQueryState',
+  path: '/pages/agnostic/basic-io',
+  nextJsRouter: 'pages',
+  description: 'Agnostic adapter'
+})
diff --git a/packages/e2e/next/src/app/app/agnostic/basic-io/page.tsx b/packages/e2e/next/src/app/app/agnostic/basic-io/page.tsx
new file mode 100644
index 000000000..b0e7003ce
--- /dev/null
+++ b/packages/e2e/next/src/app/app/agnostic/basic-io/page.tsx
@@ -0,0 +1,10 @@
+import { UseQueryStateBasicIO } from 'e2e-shared/specs/basic-io'
+import { Suspense } from 'react'
+
+export default function Page() {
+  return (
+    <Suspense>
+      <UseQueryStateBasicIO />
+    </Suspense>
+  )
+}
diff --git a/packages/e2e/next/src/app/app/agnostic/layout.tsx b/packages/e2e/next/src/app/app/agnostic/layout.tsx
new file mode 100644
index 000000000..a46ce5fa8
--- /dev/null
+++ b/packages/e2e/next/src/app/app/agnostic/layout.tsx
@@ -0,0 +1,10 @@
+import { NuqsAdapter } from 'nuqs/adapters/next'
+import type { ReactNode } from 'react'
+
+export default function RouterAgnosticLayout({
+  children
+}: {
+  children: ReactNode
+}) {
+  return <NuqsAdapter>{children}</NuqsAdapter>
+}
diff --git a/packages/e2e/next/src/pages/pages/agnostic/basic-io.tsx b/packages/e2e/next/src/pages/pages/agnostic/basic-io.tsx
new file mode 100644
index 000000000..b989a9302
--- /dev/null
+++ b/packages/e2e/next/src/pages/pages/agnostic/basic-io.tsx
@@ -0,0 +1,10 @@
+import { UseQueryStateBasicIO } from 'e2e-shared/specs/basic-io'
+import { NuqsAdapter } from 'nuqs/adapters/next'
+
+export default function Page() {
+  return (
+    <NuqsAdapter>
+      <UseQueryStateBasicIO />
+    </NuqsAdapter>
+  )
+}
diff --git a/turbo.json b/turbo.json
index ade23ed60..c6a8f8642 100644
--- a/turbo.json
+++ b/turbo.json
@@ -9,7 +9,7 @@
       "dependsOn": ["^build"]
     },
     "nuqs#build": {
-      "outputs": ["dist/**", "size.json", ".tsup"]
+      "outputs": ["dist/**", "size.json", ".tsup/**", ".tsbuildinfo"]
     },
     "e2e-next#build": {
       "outputs": [".next/**", "!.next/cache/**", "cypress/**"],