diff --git a/docs/advanced-features/codemods.md b/docs/advanced-features/codemods.md
index 0a8b146b5cf286..512872ed3ea778 100644
--- a/docs/advanced-features/codemods.md
+++ b/docs/advanced-features/codemods.md
@@ -19,6 +19,30 @@ Codemods are transformations that run on your codebase programmatically. This al
 
 ## Next.js 13
 
+### `new-link`
+
+Safely removes `<a>` from `next/link` or adds `legacyBehavior` prop.
+
+For example:
+
+```jsx
+export default function Page() {
+  return (
+    <Link href="/about">
+      <a>About Us</a>
+    </Link>
+  )
+}
+```
+
+Transforms into:
+
+```jsx
+export default function Page() {
+  return <Link href="/about">About Us</Link>
+}
+```
+
 ### `next-image-to-legacy-image`
 
 Safely migrates existing Next.js 10, 11, 12 applications importing `next/image` to the renamed `next/legacy/image` import in Next.js 13.
diff --git a/docs/advanced-features/i18n-routing.md b/docs/advanced-features/i18n-routing.md
index c4ed2f39e00676..0e0ddf9cc30949 100644
--- a/docs/advanced-features/i18n-routing.md
+++ b/docs/advanced-features/i18n-routing.md
@@ -233,7 +233,7 @@ import Link from 'next/link'
 export default function IndexPage(props) {
   return (
     <Link href="/another" locale="fr">
-      <a>To /fr/another</a>
+      To /fr/another
     </Link>
   )
 }
@@ -279,7 +279,7 @@ import Link from 'next/link'
 export default function IndexPage(props) {
   return (
     <Link href="/fr/another" locale={false}>
-      <a>To /fr/another</a>
+      To /fr/another
     </Link>
   )
 }
diff --git a/docs/api-reference/next.config.js/basepath.md b/docs/api-reference/next.config.js/basepath.md
index 0df919b35a0575..696120ba4c662c 100644
--- a/docs/api-reference/next.config.js/basepath.md
+++ b/docs/api-reference/next.config.js/basepath.md
@@ -35,9 +35,7 @@ For example, using `/about` will automatically become `/docs/about` when `basePa
 export default function HomePage() {
   return (
     <>
-      <Link href="/about">
-        <a>About Page</a>
-      </Link>
+      <Link href="/about">About Page</Link>
     </>
   )
 }
diff --git a/docs/api-reference/next/link.md b/docs/api-reference/next/link.md
index fa3a74405accdb..c8261e651f20b3 100644
--- a/docs/api-reference/next/link.md
+++ b/docs/api-reference/next/link.md
@@ -31,19 +31,13 @@ function Home() {
   return (
     <ul>
       <li>
-        <Link href="/">
-          <a>Home</a>
-        </Link>
+        <Link href="/">Home</Link>
       </li>
       <li>
-        <Link href="/about">
-          <a>About Us</a>
-        </Link>
+        <Link href="/about">About Us</Link>
       </li>
       <li>
-        <Link href="/blog/hello-world">
-          <a>Blog Post</a>
-        </Link>
+        <Link href="/blog/hello-world">Blog Post</Link>
       </li>
     </ul>
   )
@@ -56,6 +50,7 @@ export default Home
 
 - `href` - The path or URL to navigate to. This is the only required prop. It can also be an object, see [example here](/docs/api-reference/next/link.md#with-url-object)
 - `as` - Optional decorator for the path that will be shown in the browser URL bar. Before Next.js 9.5.3 this was used for dynamic routes, check our [previous docs](https://nextjs.org/docs/tag/v9.5.2/api-reference/next/link#dynamic-routes) to see how it worked. Note: when this path differs from the one provided in `href` the previous `href`/`as` behavior is used as shown in the [previous docs](https://nextjs.org/docs/tag/v9.5.2/api-reference/next/link#dynamic-routes).
+- [`legacyBehavior`](#if-the-child-is-a-tag) - Changes behavior so that child must be `<a>`. Defaults to `false`.
 - [`passHref`](#if-the-child-is-a-custom-component-that-wraps-an-a-tag) - Forces `Link` to send the `href` property to its child. Defaults to `false`
 - `prefetch` - Prefetch the page in the background. Defaults to `true`. Any `<Link />` that is in the viewport (initially or through scroll) will be preloaded. Prefetch can be disabled by passing `prefetch={false}`. When `prefetch` is set to `false`, prefetching will still occur on hover. Pages using [Static Generation](/docs/basic-features/data-fetching/get-static-props.md) will preload `JSON` files with the data for faster page transitions. Prefetching is only enabled in production.
 - [`replace`](#replace-the-url-instead-of-push) - Replace the current `history` state instead of adding a new url into the stack. Defaults to `false`
@@ -78,7 +73,7 @@ function Posts({ posts }) {
       {posts.map((post) => (
         <li key={post.id}>
           <Link href={`/blog/${encodeURIComponent(post.slug)}`}>
-            <a>{post.title}</a>
+            {post.title}
           </Link>
         </li>
       ))}
@@ -89,6 +84,22 @@ function Posts({ posts }) {
 export default Posts
 ```
 
+## If the child is `<a>` tag
+
+```jsx
+import Link from 'next/link'
+
+function Legacy() {
+  return (
+    <Link href="/about" legacyBehavior>
+      <a>About Us</a>
+    </Link>
+  )
+}
+
+export default Legacy
+```
+
 ## If the child is a custom component that wraps an `<a>` tag
 
 If the child of `Link` is a custom component that wraps an `<a>` tag, you must add `passHref` to `Link`. This is necessary if you’re using libraries like [styled-components](https://styled-components.com/). Without this, the `<a>` tag will not have the `href` attribute, which hurts your site's accessibility and might affect SEO. If you're using [ESLint](/docs/basic-features/eslint.md#eslint-plugin), there is a built-in rule `next/link-passhref` to ensure correct usage of `passHref`.
@@ -103,9 +114,8 @@ const RedLink = styled.a`
 `
 
 function NavLink({ href, name }) {
-  // Must add passHref to Link
   return (
-    <Link href={href} passHref>
+    <Link href={href} passHref legacyBehavior>
       <RedLink>{name}</RedLink>
     </Link>
   )
@@ -119,7 +129,7 @@ export default NavLink
 
 ## If the child is a functional component
 
-If the child of `Link` is a functional component, in addition to using `passHref`, you must wrap the component in [`React.forwardRef`](https://reactjs.org/docs/react-api.html#reactforwardref):
+If the child of `Link` is a functional component, in addition to using `passHref` and `legacyBehavior`, you must wrap the component in [`React.forwardRef`](https://reactjs.org/docs/react-api.html#reactforwardref):
 
 ```jsx
 import Link from 'next/link'
@@ -136,7 +146,7 @@ const MyButton = React.forwardRef(({ onClick, href }, ref) => {
 
 function Home() {
   return (
-    <Link href="/about" passHref>
+    <Link href="/about" passHref legacyBehavior>
       <MyButton />
     </Link>
   )
@@ -162,7 +172,7 @@ function Home() {
             query: { name: 'test' },
           }}
         >
-          <a>About us</a>
+          About us
         </Link>
       </li>
       <li>
@@ -172,7 +182,7 @@ function Home() {
             query: { slug: 'my-post' },
           }}
         >
-          <a>Blog Post</a>
+          Blog Post
         </Link>
       </li>
     </ul>
@@ -195,7 +205,7 @@ The default behavior of the `Link` component is to `push` a new URL into the `hi
 
 ```jsx
 <Link href="/about" replace>
-  <a>About us</a>
+  About us
 </Link>
 ```
 
@@ -205,6 +215,6 @@ The default behavior of `Link` is to scroll to the top of the page. When there i
 
 ```jsx
 <Link href="/#hashid" scroll={false}>
-  <a>Disables scrolling to the top</a>
+  Disables scrolling to the top
 </Link>
 ```
diff --git a/docs/api-reference/next/router.md b/docs/api-reference/next/router.md
index e068a85e479acc..c108f9f60aee59 100644
--- a/docs/api-reference/next/router.md
+++ b/docs/api-reference/next/router.md
@@ -156,11 +156,7 @@ export default function Page(props) {
       <h1>Page: {router.query.slug}</h1>
       <p>Count: {count}</p>
       <button onClick={() => setCount(count + 1)}>Increase count</button>
-      <Link href="/one">
-        <a>one</a>
-      </Link> <Link href="/two">
-        <a>two</a>
-      </Link>
+      <Link href="/one">one</Link> <Link href="/two">two</Link>
     </div>
   )
 }
diff --git a/docs/migrating/from-gatsby.md b/docs/migrating/from-gatsby.md
index d8388b283c75f5..98031267bc2ffb 100644
--- a/docs/migrating/from-gatsby.md
+++ b/docs/migrating/from-gatsby.md
@@ -78,15 +78,11 @@ export default function Home() {
 import Link from 'next/link'
 
 export default function Home() {
-  return (
-    <Link href="/blog">
-      <a>blog</a>
-    </Link>
-  )
+  return <Link href="/blog">blog</Link>
 }
 ```
 
-Update any import statements, switch `to` to `href`, and add an `<a>` tag as a child of the element.
+Update any import statements, switch `to` to `href`.
 
 ## Data Fetching
 
diff --git a/docs/migrating/from-react-router.md b/docs/migrating/from-react-router.md
index a81482f5e1ec3d..1174eaa5ed3c9a 100644
--- a/docs/migrating/from-react-router.md
+++ b/docs/migrating/from-react-router.md
@@ -34,7 +34,7 @@ import Link from 'next/link'
 export default function App() {
   return (
     <Link href="/about">
-      <a>About</a>
+      About
     </Link>
   )
 }
diff --git a/docs/routing/dynamic-routes.md b/docs/routing/dynamic-routes.md
index 9f0b7f66517f4b..87c02e856791de 100644
--- a/docs/routing/dynamic-routes.md
+++ b/docs/routing/dynamic-routes.md
@@ -63,18 +63,14 @@ function Home() {
   return (
     <ul>
       <li>
-        <Link href="/post/abc">
-          <a>Go to pages/post/[pid].js</a>
-        </Link>
+        <Link href="/post/abc">Go to pages/post/[pid].js</Link>
       </li>
       <li>
-        <Link href="/post/abc?foo=bar">
-          <a>Also goes to pages/post/[pid].js</a>
-        </Link>
+        <Link href="/post/abc?foo=bar">Also goes to pages/post/[pid].js</Link>
       </li>
       <li>
         <Link href="/post/abc/a-comment">
-          <a>Go to pages/post/[pid]/[comment].js</a>
+          Go to pages/post/[pid]/[comment].js
         </Link>
       </li>
     </ul>
diff --git a/docs/routing/introduction.md b/docs/routing/introduction.md
index c2b8c8ddc8cd6d..4fb506cbf7fa7b 100644
--- a/docs/routing/introduction.md
+++ b/docs/routing/introduction.md
@@ -47,19 +47,13 @@ function Home() {
   return (
     <ul>
       <li>
-        <Link href="/">
-          <a>Home</a>
-        </Link>
+        <Link href="/">Home</Link>
       </li>
       <li>
-        <Link href="/about">
-          <a>About Us</a>
-        </Link>
+        <Link href="/about">About Us</Link>
       </li>
       <li>
-        <Link href="/blog/hello-world">
-          <a>Blog Post</a>
-        </Link>
+        <Link href="/blog/hello-world">Blog Post</Link>
       </li>
     </ul>
   )
@@ -89,7 +83,7 @@ function Posts({ posts }) {
       {posts.map((post) => (
         <li key={post.id}>
           <Link href={`/blog/${encodeURIComponent(post.slug)}`}>
-            <a>{post.title}</a>
+            {post.title}
           </Link>
         </li>
       ))}
@@ -118,7 +112,7 @@ function Posts({ posts }) {
               query: { slug: post.slug },
             }}
           >
-            <a>{post.title}</a>
+            {post.title}
           </Link>
         </li>
       ))}
diff --git a/docs/testing.md b/docs/testing.md
index 3906a4e87e57c6..7dca84b8879af9 100644
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -66,9 +66,7 @@ import Link from 'next/link'
 export default function Home() {
   return (
     <nav>
-      <Link href="/about">
-        <a>About</a>
-      </Link>
+      <Link href="/about">About</Link>
     </nav>
   )
 }
@@ -183,9 +181,7 @@ import Link from 'next/link'
 export default function Home() {
   return (
     <nav>
-      <Link href="/about">
-        <a>About</a>
-      </Link>
+      <Link href="/about">About</Link>
     </nav>
   )
 }
diff --git a/docs/upgrading.md b/docs/upgrading.md
index b03728b76f4def..7c087383990b28 100644
--- a/docs/upgrading.md
+++ b/docs/upgrading.md
@@ -11,6 +11,8 @@ The minimum Node.js version has been bumped from 12.22.0 to 14.0.0, since 12.x h
 The `next/image` import was renamed to `next/legacy/image`. The `next/future/image` import was renamed to `next/image`.
 A [codemod is available](/docs/advanced-features/codemods.md#next-image-to-legacy-image) to safely and automatically rename your imports.
 
+The `next/link` child can no longer be `<a>`. Add the `legacyBehavior` prop to use the legacy behavior or remove the `<a>` to upgrade. A [codemod is available](/docs/advanced-features/codemods.md#new-link) to automatically upgrade your code.
+
 ## Upgrading to 12.2
 
 If you were using Middleware prior to `12.2`, please see the [upgrade guide](https://nextjs.org/docs/messages/middleware-upgrade-guide) for more information.
diff --git a/packages/next/build/jest/jest.ts b/packages/next/build/jest/jest.ts
index be176de4f091f2..ef17dc10a18984 100644
--- a/packages/next/build/jest/jest.ts
+++ b/packages/next/build/jest/jest.ts
@@ -1,7 +1,7 @@
 import { loadEnvConfig } from '@next/env'
 import { resolve, join } from 'path'
 import loadConfig from '../../server/config'
-import { NextConfigComplete } from '../../server/config-shared'
+import type { NextConfigComplete } from '../../server/config-shared'
 import { PHASE_TEST } from '../../shared/lib/constants'
 import loadJsConfig from '../load-jsconfig'
 import * as Log from '../output/log'
diff --git a/packages/next/server/config-shared.ts b/packages/next/server/config-shared.ts
index 09e41c61db6e43..6286da3da52852 100644
--- a/packages/next/server/config-shared.ts
+++ b/packages/next/server/config-shared.ts
@@ -556,8 +556,7 @@ export const defaultConfig: NextConfig = {
     // TODO: change default in next major release (current v12.1.5)
     legacyBrowsers: true,
     browsersListForSwc: false,
-    // TODO: change default in next major release (current v12.1.5)
-    newNextLinkBehavior: false,
+    newNextLinkBehavior: true,
     cpus: Math.max(
       1,
       (Number(process.env.CIRCLE_NODE_TOTAL) ||
diff --git a/test/development/basic-basepath/hmr/pages/hmr/index.js b/test/development/basic-basepath/hmr/pages/hmr/index.js
index 01557c87ae63fb..f33384547b4660 100644
--- a/test/development/basic-basepath/hmr/pages/hmr/index.js
+++ b/test/development/basic-basepath/hmr/pages/hmr/index.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export default () => (
   <div>
-    <Link href="/hmr/error-in-gip">
-      <a id="error-in-gip-link">Bad Page</a>
+    <Link href="/hmr/error-in-gip" id="error-in-gip-link">
+      Bad Page
     </Link>
   </div>
 )
diff --git a/test/development/basic-basepath/misc/pages/development-logs/index.js b/test/development/basic-basepath/misc/pages/development-logs/index.js
index ee339f890e917c..d5470bd7ac3e01 100644
--- a/test/development/basic-basepath/misc/pages/development-logs/index.js
+++ b/test/development/basic-basepath/misc/pages/development-logs/index.js
@@ -4,7 +4,7 @@ export default function IndexPage() {
   return (
     <div>
       <Link href="/about" prefetch>
-        <a>To About Page</a>
+        To About Page
       </Link>
     </div>
   )
diff --git a/test/development/basic-basepath/misc/pages/development-logs/link-with-no-prefetch.js b/test/development/basic-basepath/misc/pages/development-logs/link-with-no-prefetch.js
index 1c3e4882dc6bfa..d2b8088442fe90 100644
--- a/test/development/basic-basepath/misc/pages/development-logs/link-with-no-prefetch.js
+++ b/test/development/basic-basepath/misc/pages/development-logs/link-with-no-prefetch.js
@@ -3,9 +3,7 @@ import Link from 'next/link'
 export default function NoPrefetchPage() {
   return (
     <div>
-      <Link href="/about">
-        <a>No prefetch</a>
-      </Link>
+      <Link href="/about">No prefetch</Link>
     </div>
   )
 }
diff --git a/test/development/basic-basepath/misc/pages/development-logs/link-with-prefetch-false.js b/test/development/basic-basepath/misc/pages/development-logs/link-with-prefetch-false.js
index 272796e78d1665..dfd977fe27083c 100644
--- a/test/development/basic-basepath/misc/pages/development-logs/link-with-prefetch-false.js
+++ b/test/development/basic-basepath/misc/pages/development-logs/link-with-prefetch-false.js
@@ -4,7 +4,7 @@ export default function PrefetchFalsePage() {
   return (
     <div>
       <Link href="/about" prefetch={false}>
-        <a>Prefetch set to false</a>
+        Prefetch set to false
       </Link>
     </div>
   )
diff --git a/test/development/basic-basepath/next-dynamic/pages/dynamic/index.js b/test/development/basic-basepath/next-dynamic/pages/dynamic/index.js
index f41eae2a5804fa..c3311057c2d5a2 100644
--- a/test/development/basic-basepath/next-dynamic/pages/dynamic/index.js
+++ b/test/development/basic-basepath/next-dynamic/pages/dynamic/index.js
@@ -2,8 +2,6 @@ import Link from 'next/link'
 
 export default () => (
   <div>
-    <Link href="/dynamic/no-chunk">
-      <a>No Chunk</a>
-    </Link>
+    <Link href="/dynamic/no-chunk">No Chunk</Link>
   </div>
 )
diff --git a/test/development/basic/hmr/pages/hmr/index.js b/test/development/basic/hmr/pages/hmr/index.js
index 01557c87ae63fb..f33384547b4660 100644
--- a/test/development/basic/hmr/pages/hmr/index.js
+++ b/test/development/basic/hmr/pages/hmr/index.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export default () => (
   <div>
-    <Link href="/hmr/error-in-gip">
-      <a id="error-in-gip-link">Bad Page</a>
+    <Link href="/hmr/error-in-gip" id="error-in-gip-link">
+      Bad Page
     </Link>
   </div>
 )
diff --git a/test/development/basic/misc/pages/development-logs/index.js b/test/development/basic/misc/pages/development-logs/index.js
index ee339f890e917c..d5470bd7ac3e01 100644
--- a/test/development/basic/misc/pages/development-logs/index.js
+++ b/test/development/basic/misc/pages/development-logs/index.js
@@ -4,7 +4,7 @@ export default function IndexPage() {
   return (
     <div>
       <Link href="/about" prefetch>
-        <a>To About Page</a>
+        To About Page
       </Link>
     </div>
   )
diff --git a/test/development/basic/misc/pages/development-logs/link-with-no-prefetch.js b/test/development/basic/misc/pages/development-logs/link-with-no-prefetch.js
index 1c3e4882dc6bfa..d2b8088442fe90 100644
--- a/test/development/basic/misc/pages/development-logs/link-with-no-prefetch.js
+++ b/test/development/basic/misc/pages/development-logs/link-with-no-prefetch.js
@@ -3,9 +3,7 @@ import Link from 'next/link'
 export default function NoPrefetchPage() {
   return (
     <div>
-      <Link href="/about">
-        <a>No prefetch</a>
-      </Link>
+      <Link href="/about">No prefetch</Link>
     </div>
   )
 }
diff --git a/test/development/basic/misc/pages/development-logs/link-with-prefetch-false.js b/test/development/basic/misc/pages/development-logs/link-with-prefetch-false.js
index 272796e78d1665..dfd977fe27083c 100644
--- a/test/development/basic/misc/pages/development-logs/link-with-prefetch-false.js
+++ b/test/development/basic/misc/pages/development-logs/link-with-prefetch-false.js
@@ -4,7 +4,7 @@ export default function PrefetchFalsePage() {
   return (
     <div>
       <Link href="/about" prefetch={false}>
-        <a>Prefetch set to false</a>
+        Prefetch set to false
       </Link>
     </div>
   )
diff --git a/test/development/basic/next-dynamic/pages/dynamic/index.js b/test/development/basic/next-dynamic/pages/dynamic/index.js
index f41eae2a5804fa..c3311057c2d5a2 100644
--- a/test/development/basic/next-dynamic/pages/dynamic/index.js
+++ b/test/development/basic/next-dynamic/pages/dynamic/index.js
@@ -2,8 +2,6 @@ import Link from 'next/link'
 
 export default () => (
   <div>
-    <Link href="/dynamic/no-chunk">
-      <a>No Chunk</a>
-    </Link>
+    <Link href="/dynamic/no-chunk">No Chunk</Link>
   </div>
 )
diff --git a/test/e2e/app-dir/app-prefetch/app/page.js b/test/e2e/app-dir/app-prefetch/app/page.js
index be3690c6321beb..7cf985c66b7934 100644
--- a/test/e2e/app-dir/app-prefetch/app/page.js
+++ b/test/e2e/app-dir/app-prefetch/app/page.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 export default function HomePage() {
   return (
     <>
-      <Link href="/dashboard">
-        <a id="to-dashboard">To Dashboard</a>
+      <Link href="/dashboard" id="to-dashboard">
+        To Dashboard
       </Link>
     </>
   )
diff --git a/test/e2e/app-dir/app-static/app/blog/[author]/page.js b/test/e2e/app-dir/app-static/app/blog/[author]/page.js
index c8e2e05c45033d..cbdefb1dd8837f 100644
--- a/test/e2e/app-dir/app-static/app/blog/[author]/page.js
+++ b/test/e2e/app-dir/app-static/app/blog/[author]/page.js
@@ -10,34 +10,34 @@ export default function Page({ params }) {
       <p id="page">/blog/[author]</p>
       <p id="params">{JSON.stringify(params)}</p>
       <p id="date">{Date.now()}</p>
-      <Link href="/blog/tim">
-        <a id="author-1">/blog/tim</a>
+      <Link href="/blog/tim" id="author-1">
+        /blog/tim
       </Link>
       <br />
-      <Link href="/blog/seb">
-        <a id="author-2">/blog/seb</a>
+      <Link href="/blog/seb" id="author-2">
+        /blog/seb
       </Link>
       <br />
-      <Link href="/blog/styfle">
-        <a id="author-3">/blog/styfle</a>
+      <Link href="/blog/styfle" id="author-3">
+        /blog/styfle
       </Link>
       <br />
 
-      <Link href="/blog/tim/first-post">
-        <a id="author-1-post-1">/blog/tim/first-post</a>
+      <Link href="/blog/tim/first-post" id="author-1-post-1">
+        /blog/tim/first-post
       </Link>
       <br />
-      <Link href="/blog/seb/second-post">
-        <a id="author-2-post-1">/blog/seb/second-post</a>
+      <Link href="/blog/seb/second-post" id="author-2-post-1">
+        /blog/seb/second-post
       </Link>
       <br />
-      <Link href="/blog/styfle/first-post">
-        <a id="author-3-post-1">/blog/styfle/first-post</a>
+      <Link href="/blog/styfle/first-post" id="author-3-post-1">
+        /blog/styfle/first-post
       </Link>
       <br />
 
-      <Link href="/dynamic-no-gen-params/first">
-        <a id="dynamic-no-params">/dynamic-no-gen-params/first</a>
+      <Link href="/dynamic-no-gen-params/first" id="dynamic-no-params">
+        /dynamic-no-gen-params/first
       </Link>
       <br />
     </>
diff --git a/test/e2e/app-dir/app-static/app/dynamic-no-gen-params/[slug]/page.js b/test/e2e/app-dir/app-static/app/dynamic-no-gen-params/[slug]/page.js
index 27b661a09fdca8..7b7ee8e7806b68 100644
--- a/test/e2e/app-dir/app-static/app/dynamic-no-gen-params/[slug]/page.js
+++ b/test/e2e/app-dir/app-static/app/dynamic-no-gen-params/[slug]/page.js
@@ -6,13 +6,13 @@ export default function Page({ params }) {
       <p id="page">/dynamic-no-gen-params</p>
       <p id="params">{JSON.stringify(params)}</p>
 
-      <Link href="/dynamic-no-gen-params/second">
-        <a id="dynamic-no-params-again">/dynamic-no-gen-params/second</a>
+      <Link href="/dynamic-no-gen-params/second" id="dynamic-no-params-again">
+        /dynamic-no-gen-params/second
       </Link>
       <br />
 
-      <Link href="/blog/styfle">
-        <a id="to-blog">/blog/styfle</a>
+      <Link href="/blog/styfle" id="to-blog">
+        /blog/styfle
       </Link>
       <br />
     </>
diff --git a/test/e2e/app-dir/app/app/catch-all-link/page.js b/test/e2e/app-dir/app/app/catch-all-link/page.js
index 59157f985f1e7a..1170d49fa5d2d0 100644
--- a/test/e2e/app-dir/app/app/catch-all-link/page.js
+++ b/test/e2e/app-dir/app/app/catch-all-link/page.js
@@ -4,13 +4,16 @@ export default function Page() {
   return (
     <>
       <div>
-        <Link href="/catch-all/this/is/a/test">
-          <a id="to-catch-all">To catch-all</a>
+        <Link href="/catch-all/this/is/a/test" id="to-catch-all">
+          To catch-all
         </Link>
       </div>
       <div>
-        <Link href="/catch-all-optional/this/is/a/test">
-          <a id="to-catch-all-optional">To optional catch-all</a>
+        <Link
+          href="/catch-all-optional/this/is/a/test"
+          id="to-catch-all-optional"
+        >
+          To optional catch-all
         </Link>
       </div>
     </>
diff --git a/test/e2e/app-dir/app/app/internal/page.js b/test/e2e/app-dir/app/app/internal/page.js
index ddbc93ea558543..525104c574ac8f 100644
--- a/test/e2e/app-dir/app/app/internal/page.js
+++ b/test/e2e/app-dir/app/app/internal/page.js
@@ -4,13 +4,13 @@ export default function Page() {
   return (
     <div>
       <div>
-        <Link href="/internal/test/rewrite">
-          <a id="navigate-rewrite">Navigate Rewrite</a>
+        <Link href="/internal/test/rewrite" id="navigate-rewrite">
+          Navigate Rewrite
         </Link>
       </div>
       <div>
-        <Link href="/internal/test/redirect">
-          <a id="navigate-redirect">Navigate Redirect</a>
+        <Link href="/internal/test/redirect" id="navigate-redirect">
+          Navigate Redirect
         </Link>
       </div>
     </div>
diff --git a/test/e2e/app-dir/app/app/link-hard-push/[id]/page.js b/test/e2e/app-dir/app/app/link-hard-push/[id]/page.js
index c440f0582c337e..0ce09bfa6ab7ea 100644
--- a/test/e2e/app-dir/app/app/link-hard-push/[id]/page.js
+++ b/test/e2e/app-dir/app/app/link-hard-push/[id]/page.js
@@ -6,8 +6,8 @@ export default function Page({ params }) {
   return (
     <>
       <h1 id={`render-id-${params.id}`}>{nanoid()}</h1>{' '}
-      <Link href={`/link-hard-push/${other}`}>
-        <a id="link">To {other}</a>
+      <Link href={`/link-hard-push/${other}`} id="link">
+        To{other}
       </Link>
     </>
   )
diff --git a/test/e2e/app-dir/app/app/link-hard-replace/[id]/page.js b/test/e2e/app-dir/app/app/link-hard-replace/[id]/page.js
index c90e93f74c78d0..6f69c10520d125 100644
--- a/test/e2e/app-dir/app/app/link-hard-replace/[id]/page.js
+++ b/test/e2e/app-dir/app/app/link-hard-replace/[id]/page.js
@@ -6,8 +6,8 @@ export default function Page({ params }) {
   return (
     <>
       <h1 id={`render-id-${params.id}`}>{nanoid()}</h1>{' '}
-      <Link href={`/link-hard-replace/${other}`} replace>
-        <a id="link">To {other}</a>
+      <Link href={`/link-hard-replace/${other}`} replace id="link">
+        To{other}
       </Link>
     </>
   )
diff --git a/test/e2e/app-dir/app/app/link-hard-replace/page.js b/test/e2e/app-dir/app/app/link-hard-replace/page.js
index 340baa107e373c..0f099a798f596f 100644
--- a/test/e2e/app-dir/app/app/link-hard-replace/page.js
+++ b/test/e2e/app-dir/app/app/link-hard-replace/page.js
@@ -5,11 +5,11 @@ export default function Page() {
   return (
     <>
       <h1 id="render-id">{nanoid()}</h1>
-      <Link href="/link-hard-replace" replace>
-        <a id="self-link">Self Link</a>
+      <Link href="/link-hard-replace" replace id="self-link">
+        Self Link
       </Link>
-      <Link href="/link-hard-replace/subpage" replace>
-        <a id="subpage-link">Subpage</a>
+      <Link href="/link-hard-replace/subpage" replace id="subpage-link">
+        Subpage
       </Link>
     </>
   )
diff --git a/test/e2e/app-dir/app/app/link-hard-replace/subpage/page.js b/test/e2e/app-dir/app/app/link-hard-replace/subpage/page.js
index cd586543ab752e..ecb43519aa8b33 100644
--- a/test/e2e/app-dir/app/app/link-hard-replace/subpage/page.js
+++ b/test/e2e/app-dir/app/app/link-hard-replace/subpage/page.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export default function Page() {
   return (
-    <Link href="/link-hard-replace" replace>
-      <a id="back-link">Self Link</a>
+    <Link href="/link-hard-replace" replace id="back-link">
+      Self Link
     </Link>
   )
 }
diff --git a/test/e2e/app-dir/app/app/link-soft-push/page.js b/test/e2e/app-dir/app/app/link-soft-push/page.js
index 049e5be9c49c77..a83690e8b51070 100644
--- a/test/e2e/app-dir/app/app/link-soft-push/page.js
+++ b/test/e2e/app-dir/app/app/link-soft-push/page.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export default function Page() {
   return (
-    <Link href="/with-id">
-      <a id="link">With ID</a>
+    <Link href="/with-id" id="link">
+      With ID
     </Link>
   )
 }
diff --git a/test/e2e/app-dir/app/app/link-soft-replace/page.js b/test/e2e/app-dir/app/app/link-soft-replace/page.js
index c65758d99076cf..26a535bb1a78a6 100644
--- a/test/e2e/app-dir/app/app/link-soft-replace/page.js
+++ b/test/e2e/app-dir/app/app/link-soft-replace/page.js
@@ -5,11 +5,11 @@ export default function Page() {
   return (
     <>
       <h1 id="render-id">{nanoid()}</h1>
-      <Link href="/link-soft-replace" replace>
-        <a id="self-link">Self Link</a>
+      <Link href="/link-soft-replace" replace id="self-link">
+        Self Link
       </Link>
-      <Link href="/link-soft-replace/subpage" replace>
-        <a id="subpage-link">Subpage</a>
+      <Link href="/link-soft-replace/subpage" replace id="subpage-link">
+        Subpage
       </Link>
     </>
   )
diff --git a/test/e2e/app-dir/app/app/link-soft-replace/subpage/page.js b/test/e2e/app-dir/app/app/link-soft-replace/subpage/page.js
index 6ee17de0650898..b1fe8890da7603 100644
--- a/test/e2e/app-dir/app/app/link-soft-replace/subpage/page.js
+++ b/test/e2e/app-dir/app/app/link-soft-replace/subpage/page.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export default function Page() {
   return (
-    <Link href="/link-soft-replace" replace>
-      <a id="back-link">Self Link</a>
+    <Link href="/link-soft-replace" replace id="back-link">
+      Self Link
     </Link>
   )
 }
diff --git a/test/e2e/app-dir/app/app/link-with-as/page.js b/test/e2e/app-dir/app/app/link-with-as/page.js
index 12a33746cc9fe4..8e3eff7d0c16d5 100644
--- a/test/e2e/app-dir/app/app/link-with-as/page.js
+++ b/test/e2e/app-dir/app/app/link-with-as/page.js
@@ -6,8 +6,9 @@ export default function Page() {
       <Link
         href="/dashboard/deployments/info/[id]"
         as="/dashboard/deployments/info/123"
+        id="link-to-info-123"
       >
-        <a id="link-to-info-123">To info 123</a>
+        To info 123
       </Link>
     </>
   )
diff --git a/test/e2e/app-dir/app/app/nested-navigation/TabNavItem.js b/test/e2e/app-dir/app/app/nested-navigation/TabNavItem.js
index 3e1cbf3dd95ddf..3e74c679f93290 100644
--- a/test/e2e/app-dir/app/app/nested-navigation/TabNavItem.js
+++ b/test/e2e/app-dir/app/app/nested-navigation/TabNavItem.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export const TabNavItem = ({ children, href }) => {
   return (
-    <Link href={href}>
-      <a style={{ margin: '10px', display: 'block' }}>{children}</a>
+    <Link href={href} style={{ margin: '10px', display: 'block' }}>
+      {children}
     </Link>
   )
 }
diff --git a/test/e2e/app-dir/app/app/pages-linking/page.js b/test/e2e/app-dir/app/app/pages-linking/page.js
index 19b7cc4b861b8a..d32b739de990e8 100644
--- a/test/e2e/app-dir/app/app/pages-linking/page.js
+++ b/test/e2e/app-dir/app/app/pages-linking/page.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export default function Page(props) {
   return (
-    <Link href="/app-linking">
-      <a id="app-link">To Pages Page</a>
+    <Link href="/app-linking" id="app-link">
+      To Pages Page
     </Link>
   )
 }
diff --git a/test/e2e/app-dir/app/app/redirect/next-config-redirect/page.js b/test/e2e/app-dir/app/app/redirect/next-config-redirect/page.js
index 95038b8326dcdf..b2f96fb405b404 100644
--- a/test/e2e/app-dir/app/app/redirect/next-config-redirect/page.js
+++ b/test/e2e/app-dir/app/app/redirect/next-config-redirect/page.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 export default function Page() {
   return (
     <>
-      <Link href="/redirect/a">
-        <a id="redirect-a">To Dashboard through /redirect/a</a>
+      <Link href="/redirect/a" id="redirect-a">
+        To Dashboard through /redirect/a
       </Link>
     </>
   )
diff --git a/test/e2e/app-dir/app/app/redirect/next-middleware-redirect/page.js b/test/e2e/app-dir/app/app/redirect/next-middleware-redirect/page.js
index 49a721599e253b..7323ef64adb965 100644
--- a/test/e2e/app-dir/app/app/redirect/next-middleware-redirect/page.js
+++ b/test/e2e/app-dir/app/app/redirect/next-middleware-redirect/page.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 export default function Page() {
   return (
     <>
-      <Link href="/redirect-middleware-to-dashboard">
-        <a id="redirect-middleware">To Dashboard through /redirect/a</a>
+      <Link href="/redirect-middleware-to-dashboard" id="redirect-middleware">
+        To Dashboard through /redirect/a
       </Link>
     </>
   )
diff --git a/test/e2e/app-dir/app/app/rewrites/page.js b/test/e2e/app-dir/app/app/rewrites/page.js
index ae97d2af2cbd4b..eeae4be1361c4b 100644
--- a/test/e2e/app-dir/app/app/rewrites/page.js
+++ b/test/e2e/app-dir/app/app/rewrites/page.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export default function Page() {
   return (
-    <Link href="/rewritten-to-dashboard">
-      <a id="link">To Dashboard Rewritten</a>
+    <Link href="/rewritten-to-dashboard" id="link">
+      To Dashboard Rewritten
     </Link>
   )
 }
diff --git a/test/e2e/app-dir/app/app/same-layout/first/page.js b/test/e2e/app-dir/app/app/same-layout/first/page.js
index bf4ba9e2455b91..2c2ebede77b4d9 100644
--- a/test/e2e/app-dir/app/app/same-layout/first/page.js
+++ b/test/e2e/app-dir/app/app/same-layout/first/page.js
@@ -4,8 +4,8 @@ export default function Page() {
   return (
     <>
       <h1 id="first-page">hello from same-layout/first</h1>
-      <Link href="/same-layout/second">
-        <a id="link">To Second</a>
+      <Link href="/same-layout/second" id="link">
+        To Second
       </Link>
     </>
   )
diff --git a/test/e2e/app-dir/app/app/same-layout/second/page.js b/test/e2e/app-dir/app/app/same-layout/second/page.js
index 9d981dcb708aa6..9eefb7df26093d 100644
--- a/test/e2e/app-dir/app/app/same-layout/second/page.js
+++ b/test/e2e/app-dir/app/app/same-layout/second/page.js
@@ -4,8 +4,8 @@ export default function Page() {
   return (
     <>
       <h1 id="second-page">hello from same-layout/second</h1>
-      <Link href="/same-layout/first">
-        <a id="link">To First</a>
+      <Link href="/same-layout/first" id="link">
+        To First
       </Link>
     </>
   )
diff --git a/test/e2e/app-dir/app/app/template/clientcomponent/other/page.js b/test/e2e/app-dir/app/app/template/clientcomponent/other/page.js
index 24c81bb71930df..dc90e11c70e5fe 100644
--- a/test/e2e/app-dir/app/app/template/clientcomponent/other/page.js
+++ b/test/e2e/app-dir/app/app/template/clientcomponent/other/page.js
@@ -3,8 +3,8 @@ export default function Page() {
   return (
     <>
       <p id="other-page">Other Page</p>
-      <Link href="/template/clientcomponent">
-        <a id="link">To Page</a>
+      <Link href="/template/clientcomponent" id="link">
+        To Page
       </Link>
     </>
   )
diff --git a/test/e2e/app-dir/app/app/template/clientcomponent/page.js b/test/e2e/app-dir/app/app/template/clientcomponent/page.js
index 89378c7e29f176..4c9988bb9b33bf 100644
--- a/test/e2e/app-dir/app/app/template/clientcomponent/page.js
+++ b/test/e2e/app-dir/app/app/template/clientcomponent/page.js
@@ -4,8 +4,8 @@ export default function Page() {
   return (
     <>
       <p id="page">Page</p>
-      <Link href="/template/clientcomponent/other">
-        <a id="link">To Other</a>
+      <Link href="/template/clientcomponent/other" id="link">
+        To Other
       </Link>
     </>
   )
diff --git a/test/e2e/app-dir/app/app/template/servercomponent/other/page.js b/test/e2e/app-dir/app/app/template/servercomponent/other/page.js
index 2ed3a0fa15cef9..b9892154b6d4e8 100644
--- a/test/e2e/app-dir/app/app/template/servercomponent/other/page.js
+++ b/test/e2e/app-dir/app/app/template/servercomponent/other/page.js
@@ -3,8 +3,8 @@ export default function Page() {
   return (
     <>
       <p id="other-page">Other Page</p>
-      <Link href="/template/servercomponent">
-        <a id="link">To Page</a>
+      <Link href="/template/servercomponent" id="link">
+        To Page
       </Link>
     </>
   )
diff --git a/test/e2e/app-dir/app/app/template/servercomponent/page.js b/test/e2e/app-dir/app/app/template/servercomponent/page.js
index 27a7097ccd650c..bb83fba1ea7faa 100644
--- a/test/e2e/app-dir/app/app/template/servercomponent/page.js
+++ b/test/e2e/app-dir/app/app/template/servercomponent/page.js
@@ -4,8 +4,8 @@ export default function Page() {
   return (
     <>
       <p id="page">Page</p>
-      <Link href="/template/servercomponent/other">
-        <a id="link">To Other</a>
+      <Link href="/template/servercomponent/other" id="link">
+        To Other
       </Link>
     </>
   )
diff --git a/test/e2e/app-dir/app/app/with-id/page.js b/test/e2e/app-dir/app/app/with-id/page.js
index 07beecc4203fa3..afaab4d7d4aa01 100644
--- a/test/e2e/app-dir/app/app/with-id/page.js
+++ b/test/e2e/app-dir/app/app/with-id/page.js
@@ -5,8 +5,8 @@ export default function Page() {
   return (
     <>
       <h1 id="render-id">{nanoid()}</h1>
-      <Link href="/navigation">
-        <a id="link">To Navigation</a>
+      <Link href="/navigation" id="link">
+        To Navigation
       </Link>
     </>
   )
diff --git a/test/e2e/app-dir/app/pages/app-linking.js b/test/e2e/app-dir/app/pages/app-linking.js
index 0a8e0289afe47e..3ef5245032ae91 100644
--- a/test/e2e/app-dir/app/pages/app-linking.js
+++ b/test/e2e/app-dir/app/pages/app-linking.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export default function Page(props) {
   return (
-    <Link href="/pages-linking">
-      <a id="pages-link">To App Page</a>
+    <Link href="/pages-linking" id="pages-link">
+      To App Page
     </Link>
   )
 }
diff --git a/test/e2e/app-dir/app/pages/link-to-rewritten-path.js b/test/e2e/app-dir/app/pages/link-to-rewritten-path.js
index 177f41aa73e336..ed212bfb085928 100644
--- a/test/e2e/app-dir/app/pages/link-to-rewritten-path.js
+++ b/test/e2e/app-dir/app/pages/link-to-rewritten-path.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 export default function Page(props) {
   return (
     <>
-      <Link href="/exists-but-not-routed">
-        <a id="link-to-rewritten-path">Exists but not routed</a>
+      <Link href="/exists-but-not-routed" id="link-to-rewritten-path">
+        Exists but not routed
       </Link>
     </>
   )
diff --git a/test/e2e/app-dir/asset-prefix/app/page.js b/test/e2e/app-dir/asset-prefix/app/page.js
index f02fd1b341b1c4..c00ce2fb17b1ad 100644
--- a/test/e2e/app-dir/asset-prefix/app/page.js
+++ b/test/e2e/app-dir/asset-prefix/app/page.js
@@ -3,8 +3,8 @@ export default function HomePage() {
   return (
     <>
       <p>
-        <Link href="/a/">
-          <a id="to-a-trailing-slash">To a with trailing slash</a>
+        <Link href="/a/" id="to-a-trailing-slash">
+          To a with trailing slash
         </Link>
       </p>
     </>
diff --git a/test/e2e/app-dir/rsc-basic/app/next-api/link/page.js b/test/e2e/app-dir/rsc-basic/app/next-api/link/page.js
index 13a9616be5e617..6f6893b2c31def 100644
--- a/test/e2e/app-dir/rsc-basic/app/next-api/link/page.js
+++ b/test/e2e/app-dir/rsc-basic/app/next-api/link/page.js
@@ -8,8 +8,8 @@ export default function LinkPage({ searchParams }) {
     <>
       <h3 id="query">query:{id}</h3>
       <div>
-        <Link href={`/next-api/link?id=${id + 1}`}>
-          <a id="next_id">next id</a>
+        <Link href={`/next-api/link?id=${id + 1}`} id="next_id">
+          next id
         </Link>
       </div>
       <Nav />
diff --git a/test/e2e/app-dir/rsc-basic/components/nav.js b/test/e2e/app-dir/rsc-basic/components/nav.js
index 142281cdf543d4..4b47ed0ab1040b 100644
--- a/test/e2e/app-dir/rsc-basic/components/nav.js
+++ b/test/e2e/app-dir/rsc-basic/components/nav.js
@@ -4,18 +4,18 @@ export default function Nav() {
   return (
     <>
       <div>
-        <Link href={'/next-api/link'}>
-          <a id="goto-next-link">next link</a>
+        <Link href={'/next-api/link'} id="goto-next-link">
+          next link
         </Link>
       </div>
       <div>
-        <Link href={'/streaming-rsc'}>
-          <a id="goto-streaming-rsc">streaming rsc</a>
+        <Link href={'/streaming-rsc'} id="goto-streaming-rsc">
+          streaming rsc
         </Link>
       </div>
       <div>
-        <Link href={'/root'}>
-          <a id="goto-home">home</a>
+        <Link href={'/root'} id="goto-home">
+          home
         </Link>
       </div>
     </>
diff --git a/test/e2e/app-dir/trailingslash/app/page.js b/test/e2e/app-dir/trailingslash/app/page.js
index f02fd1b341b1c4..c00ce2fb17b1ad 100644
--- a/test/e2e/app-dir/trailingslash/app/page.js
+++ b/test/e2e/app-dir/trailingslash/app/page.js
@@ -3,8 +3,8 @@ export default function HomePage() {
   return (
     <>
       <p>
-        <Link href="/a/">
-          <a id="to-a-trailing-slash">To a with trailing slash</a>
+        <Link href="/a/" id="to-a-trailing-slash">
+          To a with trailing slash
         </Link>
       </p>
     </>
diff --git a/test/e2e/basepath/pages/absolute-url-basepath.js b/test/e2e/basepath/pages/absolute-url-basepath.js
index 2eb79686863cb6..09e8e607e18716 100644
--- a/test/e2e/basepath/pages/absolute-url-basepath.js
+++ b/test/e2e/basepath/pages/absolute-url-basepath.js
@@ -13,11 +13,12 @@ export default function Page({ port }) {
   const router = useRouter()
   return (
     <>
-      <Link href={`http://localhost:${port}${router.basePath}/something-else`}>
-        <a id="absolute-link">
-          http://localhost:{port}
-          {router.basePath}/something-else
-        </a>
+      <Link
+        href={`http://localhost:${port}${router.basePath}/something-else`}
+        id="absolute-link"
+      >
+        http://localhost:{port}
+        {router.basePath}/something-else
       </Link>
     </>
   )
diff --git a/test/e2e/basepath/pages/absolute-url-no-basepath.js b/test/e2e/basepath/pages/absolute-url-no-basepath.js
index fb91bedaab51b1..fe56f971533ef5 100644
--- a/test/e2e/basepath/pages/absolute-url-no-basepath.js
+++ b/test/e2e/basepath/pages/absolute-url-no-basepath.js
@@ -11,8 +11,11 @@ export async function getServerSideProps({ query: { port } }) {
 export default function Page({ port }) {
   return (
     <>
-      <Link href={`http://localhost:${port}/rewrite-no-basepath`}>
-        <a id="absolute-link">http://localhost:{port}/rewrite-no-basepath</a>
+      <Link
+        href={`http://localhost:${port}/rewrite-no-basepath`}
+        id="absolute-link"
+      >
+        http://localhost:{port}/rewrite-no-basepath
       </Link>
     </>
   )
diff --git a/test/e2e/basepath/pages/absolute-url.js b/test/e2e/basepath/pages/absolute-url.js
index 9d3c45efa7d308..2ff305be03b14c 100644
--- a/test/e2e/basepath/pages/absolute-url.js
+++ b/test/e2e/basepath/pages/absolute-url.js
@@ -4,12 +4,12 @@ import Link from 'next/link'
 export default function Page() {
   return (
     <>
-      <Link href="https://vercel.com/">
-        <a id="absolute-link">https://vercel.com/</a>
+      <Link href="https://vercel.com/" id="absolute-link">
+        https://vercel.com/
       </Link>
       <br />
-      <Link href="mailto:idk@idk.com">
-        <a id="mailto-link">mailto:idk@idk.com</a>
+      <Link href="mailto:idk@idk.com" id="mailto-link">
+        mailto:idk@idk.com
       </Link>
     </>
   )
diff --git a/test/e2e/basepath/pages/hello.js b/test/e2e/basepath/pages/hello.js
index b5d7ee3da1184a..966ccab36d37db 100644
--- a/test/e2e/basepath/pages/hello.js
+++ b/test/e2e/basepath/pages/hello.js
@@ -3,49 +3,39 @@ import { useRouter } from 'next/router'
 
 const Page = () => (
   <>
-    <Link href="/other-page">
-      <a id="other-page-link">
-        <h1>Hello World</h1>
-      </a>
+    <Link href="/other-page" id="other-page-link">
+      <h1>Hello World</h1>
     </Link>
     <br />
-    <Link href="/gsp">
-      <a id="gsp-link">
-        <h1>getStaticProps</h1>
-      </a>
+    <Link href="/gsp" id="gsp-link">
+      <h1>getStaticProps</h1>
     </Link>
     <br />
-    <Link href="/gssp">
-      <a id="gssp-link">
-        <h1>getServerSideProps</h1>
-      </a>
+    <Link href="/gssp" id="gssp-link">
+      <h1>getServerSideProps</h1>
     </Link>
     <br />
-    <Link href="/[slug]" as="/first">
-      <a id="dynamic-link">
-        <h1>dynamic page</h1>
-      </a>
+    <Link href="/[slug]" as="/first" id="dynamic-link">
+      <h1>dynamic page</h1>
     </Link>
     <br />
-    <Link href="/catchall/[...parts]" as="/catchall/hello/world">
-      <a id="catchall-link">
-        <h1>catchall page</h1>
-      </a>
+    <Link
+      href="/catchall/[...parts]"
+      as="/catchall/hello/world"
+      id="catchall-link"
+    >
+      <h1>catchall page</h1>
     </Link>
     <br />
-    <Link href="/">
-      <a id="index-gsp">
-        <h1>index getStaticProps</h1>
-      </a>
+    <Link href="/" id="index-gsp">
+      <h1>index getStaticProps</h1>
     </Link>
     <br />
-    <Link href="/index">
-      <a id="nested-index-gsp">
-        <h1>nested index getStaticProps</h1>
-      </a>
+    <Link href="/index" id="nested-index-gsp">
+      <h1>nested index getStaticProps</h1>
     </Link>
-    <Link href="#hashlink">
-      <a id="hashlink">Hash Link</a>
+    <Link href="#hashlink" id="hashlink">
+      Hash Link
     </Link>
     <br />
     <div id="base-path">{useRouter().basePath}</div>
@@ -60,23 +50,17 @@ const Page = () => (
     </div>
     <br />
     <div id="as-path">{useRouter().asPath}</div>
-    <Link href="/slow-route">
-      <a id="slow-route">
-        <h1>Slow route</h1>
-      </a>
+    <Link href="/slow-route" id="slow-route">
+      <h1>Slow route</h1>
     </Link>
-    <Link href="/error-route">
-      <a id="error-route">
-        <h1>Error route</h1>
-      </a>
+    <Link href="/error-route" id="error-route">
+      <h1>Error route</h1>
     </Link>
-    <Link href="/hello#some-hash">
-      <a id="hash-change">
-        <h1>Hash change</h1>
-      </a>
+    <Link href="/hello#some-hash" id="hash-change">
+      <h1>Hash change</h1>
     </Link>
-    <Link href="/something-else" as="/hello">
-      <a id="something-else-link">to something else</a>
+    <Link href="/something-else" as="/hello" id="something-else-link">
+      to something else
     </Link>
   </>
 )
diff --git a/test/e2e/basepath/pages/index.js b/test/e2e/basepath/pages/index.js
index c4550e9874297b..52c4affcf98c9b 100644
--- a/test/e2e/basepath/pages/index.js
+++ b/test/e2e/basepath/pages/index.js
@@ -20,8 +20,8 @@ export default function Index({ hello, nested }) {
       <p id="query">{JSON.stringify(query)}</p>
       <p id="pathname">{pathname}</p>
       <p id="as-path">{asPath}</p>
-      <Link href="/hello">
-        <a id="hello-link">to /hello</a>
+      <Link href="/hello" id="hello-link">
+        to /hello
       </Link>
     </>
   )
diff --git a/test/e2e/basepath/pages/invalid-manual-basepath.js b/test/e2e/basepath/pages/invalid-manual-basepath.js
index 3fe46a8b4e480f..df7b075e3c0398 100644
--- a/test/e2e/basepath/pages/invalid-manual-basepath.js
+++ b/test/e2e/basepath/pages/invalid-manual-basepath.js
@@ -3,10 +3,8 @@ import { useRouter } from 'next/router'
 
 const Page = () => (
   <>
-    <Link href={`${useRouter().basePath}/other-page`}>
-      <a id="other-page-link">
-        <h1>Hello World</h1>
-      </a>
+    <Link href={`${useRouter().basePath}/other-page`} id="other-page-link">
+      <h1>Hello World</h1>
     </Link>
   </>
 )
diff --git a/test/e2e/basepath/pages/link-to-root.js b/test/e2e/basepath/pages/link-to-root.js
index b997873d2b82a8..d796894f5b55b3 100644
--- a/test/e2e/basepath/pages/link-to-root.js
+++ b/test/e2e/basepath/pages/link-to-root.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 export default function Page() {
   return (
     <>
-      <Link href="/">
-        <a id="link-back">back</a>
+      <Link href="/" id="link-back">
+        back
       </Link>
     </>
   )
diff --git a/test/e2e/dynamic-route-interpolation/index.test.ts b/test/e2e/dynamic-route-interpolation/index.test.ts
index 874353991e6b06..a7fb9b82168a45 100644
--- a/test/e2e/dynamic-route-interpolation/index.test.ts
+++ b/test/e2e/dynamic-route-interpolation/index.test.ts
@@ -23,8 +23,8 @@ describe('Dynamic Route Interpolation', () => {
             return (
               <>
                 <p id="slug">{props.slug}</p>
-                <Link href={router.asPath}>
-                  <a id="now">{props.now}</a>
+                <Link id="now" href={router.asPath}>
+                  {props.now}
                 </Link>
               </>
             )
diff --git a/test/e2e/getserversideprops/app/pages/another/index.js b/test/e2e/getserversideprops/app/pages/another/index.js
index d582273fc39243..52b70952ffff98 100644
--- a/test/e2e/getserversideprops/app/pages/another/index.js
+++ b/test/e2e/getserversideprops/app/pages/another/index.js
@@ -19,12 +19,12 @@ export default ({ world, time }) => (
   <>
     <p>hello {world}</p>
     <span id="anotherTime">time: {time}</span>
-    <Link href="/">
-      <a id="home">to home</a>
+    <Link href="/" id="home">
+      to home
     </Link>
     <br />
-    <Link href="/something">
-      <a id="something">to something</a>
+    <Link href="/something" id="something">
+      to something
     </Link>
   </>
 )
diff --git a/test/e2e/getserversideprops/app/pages/blog/[post]/[comment].js b/test/e2e/getserversideprops/app/pages/blog/[post]/[comment].js
index d901887a86d0cc..318dbc4eb23bf7 100644
--- a/test/e2e/getserversideprops/app/pages/blog/[post]/[comment].js
+++ b/test/e2e/getserversideprops/app/pages/blog/[post]/[comment].js
@@ -17,8 +17,8 @@ export default ({ post, comment, time }) => {
       <p>Post: {post}</p>
       <p>Comment: {comment}</p>
       <span>time: {time}</span>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/e2e/getserversideprops/app/pages/blog/[post]/index.js b/test/e2e/getserversideprops/app/pages/blog/[post]/index.js
index 00d0a1288432a6..c1d8ab5be45967 100644
--- a/test/e2e/getserversideprops/app/pages/blog/[post]/index.js
+++ b/test/e2e/getserversideprops/app/pages/blog/[post]/index.js
@@ -36,8 +36,8 @@ export default ({ post, time, params, appProps, resolvedUrl }) => {
       <div id="app-url">{appProps.url}</div>
       <div id="resolved-url">{resolvedUrl}</div>
       <div id="as-path">{router.asPath}</div>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/e2e/getserversideprops/app/pages/blog/index.js b/test/e2e/getserversideprops/app/pages/blog/index.js
index 38739ee1f04ff8..821ca040d69a35 100644
--- a/test/e2e/getserversideprops/app/pages/blog/index.js
+++ b/test/e2e/getserversideprops/app/pages/blog/index.js
@@ -15,8 +15,8 @@ export default ({ slugs, time }) => {
     <>
       <p>Posts: {JSON.stringify(slugs)}</p>
       <span>time: {time}</span>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/e2e/getserversideprops/app/pages/catchall/[...path].js b/test/e2e/getserversideprops/app/pages/catchall/[...path].js
index cfbd2e1c3019ce..6da108a268bda2 100644
--- a/test/e2e/getserversideprops/app/pages/catchall/[...path].js
+++ b/test/e2e/getserversideprops/app/pages/catchall/[...path].js
@@ -21,12 +21,12 @@ export default ({ world, time, params, random }) => {
       <div id="random">{random}</div>
       <div id="params">{JSON.stringify(params)}</div>
       <div id="query">{JSON.stringify(useRouter().query)}</div>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
       <br />
-      <Link href="/another">
-        <a id="another">to another</a>
+      <Link href="/another" id="another">
+        to another
       </Link>
     </>
   )
diff --git a/test/e2e/getserversideprops/app/pages/default-revalidate.js b/test/e2e/getserversideprops/app/pages/default-revalidate.js
index 605ca305df9eb4..2c3f808754ede1 100644
--- a/test/e2e/getserversideprops/app/pages/default-revalidate.js
+++ b/test/e2e/getserversideprops/app/pages/default-revalidate.js
@@ -13,12 +13,12 @@ export default ({ world, time }) => (
   <>
     <p>hello {world}</p>
     <span>time: {time}</span>
-    <Link href="/">
-      <a id="home">to home</a>
+    <Link href="/" id="home">
+      to home
     </Link>
     <br />
-    <Link href="/something">
-      <a id="something">to something</a>
+    <Link href="/something" id="something">
+      to something
     </Link>
   </>
 )
diff --git a/test/e2e/getserversideprops/app/pages/index.js b/test/e2e/getserversideprops/app/pages/index.js
index ecd88bda1a8113..4433c9c2ee84e3 100644
--- a/test/e2e/getserversideprops/app/pages/index.js
+++ b/test/e2e/getserversideprops/app/pages/index.js
@@ -56,38 +56,42 @@ const Page = ({ world, time, url }) => {
     <>
       <p>hello {world}</p>
       <span>time: {time}</span>
-      <Link href="/non-json">
-        <a id="non-json">to non-json</a>
+      <Link href="/non-json" id="non-json">
+        to non-json
       </Link>
       <br />
-      <Link href="/another">
-        <a id="another">to another</a>
+      <Link href="/another" id="another">
+        to another
       </Link>
       <br />
-      <Link href="/something">
-        <a id="something">to something</a>
+      <Link href="/something" id="something">
+        to something
       </Link>
       <br />
-      <Link href="/normal">
-        <a id="normal">to normal</a>
+      <Link href="/normal" id="normal">
+        to normal
       </Link>
       <br />
-      <Link href="/slow">
-        <a id="slow">to slow</a>
+      <Link href="/slow" id="slow">
+        to slow
       </Link>
       <br />
-      <Link href="/blog/[post]" as="/blog/post-1">
-        <a id="post-1">to dynamic</a>
+      <Link href="/blog/[post]" as="/blog/post-1" id="post-1">
+        to dynamic
       </Link>
-      <Link href="/blog/[post]" as="/blog/post-100">
-        <a id="broken-post">to broken</a>
+      <Link href="/blog/[post]" as="/blog/post-100" id="broken-post">
+        to broken
       </Link>
       <br />
-      <Link href="/blog/[post]/[comment]" as="/blog/post-1/comment-1">
-        <a id="comment-1">to another dynamic</a>
+      <Link
+        href="/blog/[post]/[comment]"
+        as="/blog/post-1/comment-1"
+        id="comment-1"
+      >
+        to another dynamic
       </Link>
-      <Link href="/something?another=thing">
-        <a id="something-query">to something?another=thing</a>
+      <Link href="/something?another=thing" id="something-query">
+        to something?another=thing
       </Link>
     </>
   )
diff --git a/test/e2e/getserversideprops/app/pages/invalid-keys.js b/test/e2e/getserversideprops/app/pages/invalid-keys.js
index 6ad6efbd9f29fe..8c8a5ac53c98f5 100644
--- a/test/e2e/getserversideprops/app/pages/invalid-keys.js
+++ b/test/e2e/getserversideprops/app/pages/invalid-keys.js
@@ -21,12 +21,12 @@ export default ({ world, time, params, random, query }) => {
       <div id="params">{JSON.stringify(params)}</div>
       <div id="initial-query">{JSON.stringify(query)}</div>
       <div id="query">{JSON.stringify(useRouter().query)}</div>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
       <br />
-      <Link href="/another">
-        <a id="another">to another</a>
+      <Link href="/another" id="another">
+        to another
       </Link>
     </>
   )
diff --git a/test/e2e/getserversideprops/app/pages/not-found/[slug].js b/test/e2e/getserversideprops/app/pages/not-found/[slug].js
index ef680582e17a76..131342b70d1b4c 100644
--- a/test/e2e/getserversideprops/app/pages/not-found/[slug].js
+++ b/test/e2e/getserversideprops/app/pages/not-found/[slug].js
@@ -11,8 +11,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/e2e/getserversideprops/app/pages/not-found/index.js b/test/e2e/getserversideprops/app/pages/not-found/index.js
index ef680582e17a76..131342b70d1b4c 100644
--- a/test/e2e/getserversideprops/app/pages/not-found/index.js
+++ b/test/e2e/getserversideprops/app/pages/not-found/index.js
@@ -11,8 +11,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/e2e/getserversideprops/app/pages/slow/index.js b/test/e2e/getserversideprops/app/pages/slow/index.js
index 2e48d1ded6f414..5520d0d75ba355 100644
--- a/test/e2e/getserversideprops/app/pages/slow/index.js
+++ b/test/e2e/getserversideprops/app/pages/slow/index.js
@@ -15,12 +15,12 @@ export default ({ count }) => (
   <>
     <p>a slow page</p>
     <p id="hit">hit: {count}</p>
-    <Link href="/">
-      <a id="home">to home</a>
+    <Link href="/" id="home">
+      to home
     </Link>
     <br />
-    <Link href="/something">
-      <a id="something">to something</a>
+    <Link href="/something" id="something">
+      to something
     </Link>
   </>
 )
diff --git a/test/e2e/getserversideprops/app/pages/something.js b/test/e2e/getserversideprops/app/pages/something.js
index 4866de3770cfb8..ed4efdabe76d74 100644
--- a/test/e2e/getserversideprops/app/pages/something.js
+++ b/test/e2e/getserversideprops/app/pages/something.js
@@ -38,12 +38,12 @@ export default ({
       <div id="app-url">{appProps.url}</div>
       <div id="resolved-url">{resolvedUrl}</div>
       <div id="as-path">{router.asPath}</div>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
       <br />
-      <Link href="/another">
-        <a id="another">to another</a>
+      <Link href="/another" id="another">
+        to another
       </Link>
     </>
   )
diff --git a/test/e2e/getserversideprops/app/pages/user/[user]/profile.js b/test/e2e/getserversideprops/app/pages/user/[user]/profile.js
index 32d081cecedcd6..99d0ba4ffe1418 100644
--- a/test/e2e/getserversideprops/app/pages/user/[user]/profile.js
+++ b/test/e2e/getserversideprops/app/pages/user/[user]/profile.js
@@ -15,8 +15,8 @@ export default ({ user, time }) => {
     <>
       <p>User: {user}</p>
       <span>time: {time}</span>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/e2e/i18n-data-fetching-redirect/app/pages/index.js b/test/e2e/i18n-data-fetching-redirect/app/pages/index.js
index a63a1bbebf1df7..776c448bea6cf1 100644
--- a/test/e2e/i18n-data-fetching-redirect/app/pages/index.js
+++ b/test/e2e/i18n-data-fetching-redirect/app/pages/index.js
@@ -3,38 +3,40 @@ import Link from 'next/link'
 export default function Component() {
   return (
     <>
-      <Link href="/gssp-redirect/en">
-        <a id="to-gssp-redirect-en">to /gssp-redirect/en"</a>
+      <Link href="/gssp-redirect/en" id="to-gssp-redirect-en">
+        to /gssp-redirect/en"
       </Link>
-      <Link href="/gssp-redirect/sv">
-        <a id="to-gssp-redirect-sv">to /gssp-redirect/sv"</a>
+      <Link href="/gssp-redirect/sv" id="to-gssp-redirect-sv">
+        to /gssp-redirect/sv"
       </Link>
-      <Link href="/gssp-redirect/from-ctx">
-        <a id="to-gssp-redirect-from-ctx">to /gssp-redirect/from-ctx</a>
+      <Link href="/gssp-redirect/from-ctx" id="to-gssp-redirect-from-ctx">
+        to /gssp-redirect/from-ctx
       </Link>
 
-      <Link href="/gsp-blocking-redirect/en">
-        <a id="to-gsp-blocking-redirect-en">to /gsp-blocking-redirect/en"</a>
+      <Link href="/gsp-blocking-redirect/en" id="to-gsp-blocking-redirect-en">
+        to /gsp-blocking-redirect/en"
       </Link>
-      <Link href="/gsp-blocking-redirect/sv">
-        <a id="to-gsp-blocking-redirect-sv">to /gsp-blocking-redirect/sv"</a>
+      <Link href="/gsp-blocking-redirect/sv" id="to-gsp-blocking-redirect-sv">
+        to /gsp-blocking-redirect/sv"
       </Link>
-      <Link href="/gsp-blocking-redirect/from-ctx">
-        <a id="to-gsp-blocking-redirect-from-ctx">
-          to /gsp-blocking-redirect/from-ctx
-        </a>
+      <Link
+        href="/gsp-blocking-redirect/from-ctx"
+        id="to-gsp-blocking-redirect-from-ctx"
+      >
+        to /gsp-blocking-redirect/from-ctx
       </Link>
 
-      <Link href="/gsp-fallback-redirect/en">
-        <a id="to-gsp-fallback-redirect-en">to /gsp-fallback-redirect/en"</a>
+      <Link href="/gsp-fallback-redirect/en" id="to-gsp-fallback-redirect-en">
+        to /gsp-fallback-redirect/en"
       </Link>
-      <Link href="/gsp-fallback-redirect/sv">
-        <a id="to-gsp-fallback-redirect-sv">to /gsp-fallback-redirect/sv"</a>
+      <Link href="/gsp-fallback-redirect/sv" id="to-gsp-fallback-redirect-sv">
+        to /gsp-fallback-redirect/sv"
       </Link>
-      <Link href="/gsp-fallback-redirect/from-ctx">
-        <a id="to-gsp-fallback-redirect-from-ctx">
-          to /gsp-fallback-redirect/from-ctx
-        </a>
+      <Link
+        href="/gsp-fallback-redirect/from-ctx"
+        id="to-gsp-fallback-redirect-from-ctx"
+      >
+        to /gsp-fallback-redirect/from-ctx
       </Link>
     </>
   )
diff --git a/test/e2e/link-with-api-rewrite/app/pages/index.js b/test/e2e/link-with-api-rewrite/app/pages/index.js
index ae6a4e05c3a7fd..a5324fc832aa63 100644
--- a/test/e2e/link-with-api-rewrite/app/pages/index.js
+++ b/test/e2e/link-with-api-rewrite/app/pages/index.js
@@ -3,11 +3,11 @@ import Link from 'next/link'
 export default function Page() {
   return (
     <div>
-      <Link href="/some/route/for?json=true">
-        <a id="rewrite">to /some/route/for?json=true</a>
+      <Link href="/some/route/for?json=true" id="rewrite">
+        to /some/route/for?json=true
       </Link>
-      <Link href="/api/json">
-        <a id="direct">to /api/json</a>
+      <Link href="/api/json" id="direct">
+        to /api/json
       </Link>
     </div>
   )
diff --git a/test/e2e/manual-client-base-path/app/pages/another.js b/test/e2e/manual-client-base-path/app/pages/another.js
index 99d0b25f99cc2d..15bd6c9c6eaddb 100644
--- a/test/e2e/manual-client-base-path/app/pages/another.js
+++ b/test/e2e/manual-client-base-path/app/pages/another.js
@@ -27,13 +27,13 @@ export default function Page(props) {
         )}
       </p>
 
-      <Link href="/">
-        <a id="to-index">to /index</a>
+      <Link href="/" id="to-index">
+        to /index
       </Link>
       <br />
 
-      <Link href="/dynamic/first">
-        <a id="to-dynamic">to /dynamic/first</a>
+      <Link href="/dynamic/first" id="to-dynamic">
+        to /dynamic/first
       </Link>
       <br />
     </>
diff --git a/test/e2e/manual-client-base-path/app/pages/dynamic/[slug].js b/test/e2e/manual-client-base-path/app/pages/dynamic/[slug].js
index 29d34840f8f282..fedfd393aca128 100644
--- a/test/e2e/manual-client-base-path/app/pages/dynamic/[slug].js
+++ b/test/e2e/manual-client-base-path/app/pages/dynamic/[slug].js
@@ -27,13 +27,13 @@ export default function Page(props) {
         )}
       </p>
 
-      <Link href="/">
-        <a id="to-index">to /index</a>
+      <Link href="/" id="to-index">
+        to /index
       </Link>
       <br />
 
-      <Link href="/dynamic/second">
-        <a id="to-dynamic">to /dynamic/second</a>
+      <Link href="/dynamic/second" id="to-dynamic">
+        to /dynamic/second
       </Link>
       <br />
     </>
diff --git a/test/e2e/manual-client-base-path/app/pages/index.js b/test/e2e/manual-client-base-path/app/pages/index.js
index d75da658d63438..3690d1d40f4720 100644
--- a/test/e2e/manual-client-base-path/app/pages/index.js
+++ b/test/e2e/manual-client-base-path/app/pages/index.js
@@ -27,13 +27,13 @@ export default function Page(props) {
         )}
       </p>
 
-      <Link href="/another">
-        <a id="to-another">to /another</a>
+      <Link href="/another" id="to-another">
+        to /another
       </Link>
       <br />
 
-      <Link href="/dynamic/first">
-        <a id="to-dynamic">to /dynamic/first</a>
+      <Link href="/dynamic/first" id="to-dynamic">
+        to /dynamic/first
       </Link>
       <br />
     </>
diff --git a/test/e2e/middleware-base-path/app/pages/index.js b/test/e2e/middleware-base-path/app/pages/index.js
index 02138dd7460d09..a65b40f43ff620 100644
--- a/test/e2e/middleware-base-path/app/pages/index.js
+++ b/test/e2e/middleware-base-path/app/pages/index.js
@@ -6,30 +6,29 @@ export default function Main({ message }) {
       <h1 className="title">Hello {message}</h1>
       <ul>
         <li>
-          <Link href="/stream-response">
-            <a>Stream a response</a>
-          </Link>
+          <Link href="/stream-response">Stream a response</Link>
         </li>
         <li>
-          <Link href="/rewrite-me-to-about?message=refreshed">
-            <a id="link-with-rewritten-url" className={message}>
-              Rewrite me to about
-            </a>
+          <Link
+            href="/rewrite-me-to-about?message=refreshed"
+            id="link-with-rewritten-url"
+            className={message}
+          >
+            Rewrite me to about
           </Link>
         </li>
         <li>
-          <Link href="/rewrite-me-to-vercel">
-            <a>Rewrite me to Vercel</a>
-          </Link>
+          <Link href="/rewrite-me-to-vercel">Rewrite me to Vercel</Link>
         </li>
         <li>
-          <Link href="/redirect-me-to-about">
-            <a>redirect me to about</a>
-          </Link>
+          <Link href="/redirect-me-to-about">redirect me to about</Link>
         </li>
         <li>
-          <Link href="/dynamic-routes/hello-world">
-            <a id="go-to-hello-world-anchor">Hello World</a>
+          <Link
+            href="/dynamic-routes/hello-world"
+            id="go-to-hello-world-anchor"
+          >
+            Hello World
           </Link>
         </li>
       </ul>
diff --git a/test/e2e/middleware-custom-matchers-basepath/app/pages/routes.js b/test/e2e/middleware-custom-matchers-basepath/app/pages/routes.js
index 4e8bb9d0cb80c6..d6e9dda8ea2d7d 100644
--- a/test/e2e/middleware-custom-matchers-basepath/app/pages/routes.js
+++ b/test/e2e/middleware-custom-matchers-basepath/app/pages/routes.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 export default (props) => (
   <ul>
     <li>
-      <Link href="/hello">
-        <a id="hello">/hello</a>
+      <Link href="/hello" id="hello">
+        /hello
       </Link>
     </li>
   </ul>
diff --git a/test/e2e/middleware-custom-matchers-i18n/app/pages/routes.js b/test/e2e/middleware-custom-matchers-i18n/app/pages/routes.js
index 14f5eeb2af012f..de7469fb8b7eae 100644
--- a/test/e2e/middleware-custom-matchers-i18n/app/pages/routes.js
+++ b/test/e2e/middleware-custom-matchers-i18n/app/pages/routes.js
@@ -3,23 +3,23 @@ import Link from 'next/link'
 export default (props) => (
   <ul>
     <li>
-      <Link href="/hello">
-        <a id="hello">/hello</a>
+      <Link href="/hello" id="hello">
+        /hello
       </Link>
     </li>
     <li>
-      <Link href="/en/hello">
-        <a id="en_hello">/en/hello</a>
+      <Link href="/en/hello" id="en_hello">
+        /en/hello
       </Link>
     </li>
     <li>
-      <Link href="/nl-NL/hello">
-        <a id="nl-NL_hello">/nl-NL/hello</a>
+      <Link href="/nl-NL/hello" id="nl-NL_hello">
+        /nl-NL/hello
       </Link>
     </li>
     <li>
-      <Link href="/nl-NL/about">
-        <a id="nl-NL_about">/nl-NL/about</a>
+      <Link href="/nl-NL/about" id="nl-NL_about">
+        /nl-NL/about
       </Link>
     </li>
   </ul>
diff --git a/test/e2e/middleware-custom-matchers/app/pages/routes.js b/test/e2e/middleware-custom-matchers/app/pages/routes.js
index 9cd510fe3d7586..9cf902de885a85 100644
--- a/test/e2e/middleware-custom-matchers/app/pages/routes.js
+++ b/test/e2e/middleware-custom-matchers/app/pages/routes.js
@@ -3,13 +3,13 @@ import Link from 'next/link'
 export default (props) => (
   <ul>
     <li>
-      <Link href="/has-match-2?my-query=hellooo">
-        <a id="has-match-2">has-match-2</a>
+      <Link href="/has-match-2?my-query=hellooo" id="has-match-2">
+        has-match-2
       </Link>
     </li>
     <li>
-      <Link href="/has-match-3">
-        <a id="has-match-3">has-match-3</a>
+      <Link href="/has-match-3" id="has-match-3">
+        has-match-3
       </Link>
     </li>
   </ul>
diff --git a/test/e2e/middleware-general/app/pages/error.js b/test/e2e/middleware-general/app/pages/error.js
index 1b8dc13cadb51e..a5a49734cc0b65 100644
--- a/test/e2e/middleware-general/app/pages/error.js
+++ b/test/e2e/middleware-general/app/pages/error.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 export default function Errors() {
   return (
     <div>
-      <Link href="/error-throw?message=refreshed">
-        <a id="throw-on-data">Throw on data</a>
+      <Link href="/error-throw?message=refreshed" id="throw-on-data">
+        Throw on data
       </Link>
     </div>
   )
diff --git a/test/e2e/middleware-general/app/pages/shallow.js b/test/e2e/middleware-general/app/pages/shallow.js
index cd32b9880b7c9a..4d1c8564eee502 100644
--- a/test/e2e/middleware-general/app/pages/shallow.js
+++ b/test/e2e/middleware-general/app/pages/shallow.js
@@ -8,13 +8,13 @@ export default function Shallow({ message }) {
       <ul>
         <li id="message-contents">{message}</li>
         <li>
-          <Link href="/sha?hello=world" shallow>
-            <a id="shallow-link">Shallow link to ?hello=world</a>
+          <Link href="/sha?hello=world" shallow id="shallow-link">
+            Shallow link to ?hello=world
           </Link>
         </li>
         <li>
-          <Link href="/sha?hello=goodbye">
-            <a id="deep-link">Deep link to ?hello=goodbye</a>
+          <Link href="/sha?hello=goodbye" id="deep-link">
+            Deep link to ?hello=goodbye
           </Link>
         </li>
         <li>
diff --git a/test/e2e/middleware-matcher/app/pages/another-middleware.js b/test/e2e/middleware-matcher/app/pages/another-middleware.js
index 1b7c0e7560ba5f..57d698e0542ba8 100644
--- a/test/e2e/middleware-matcher/app/pages/another-middleware.js
+++ b/test/e2e/middleware-matcher/app/pages/another-middleware.js
@@ -5,8 +5,8 @@ export default function Page(props) {
     <div>
       <p id="another-middleware">This should also run the middleware</p>
       <p id="props">{JSON.stringify(props)}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </div>
diff --git a/test/e2e/middleware-matcher/app/pages/blog/[slug].js b/test/e2e/middleware-matcher/app/pages/blog/[slug].js
index 2f99a675822296..f718a7daf6b6bf 100644
--- a/test/e2e/middleware-matcher/app/pages/blog/[slug].js
+++ b/test/e2e/middleware-matcher/app/pages/blog/[slug].js
@@ -5,12 +5,12 @@ export default function Page(props) {
     <div>
       <p id="blog">This should not run the middleware</p>
       <p id="props">{JSON.stringify(props)}</p>
-      <Link href="/another-middleware">
-        <a id="to-another-middleware">to /another-middleware</a>
+      <Link href="/another-middleware" id="to-another-middleware">
+        to /another-middleware
       </Link>
       <br />
-      <Link href="/blog/slug-2">
-        <a id="to-blog-slug-2">to /blog/slug-2</a>
+      <Link href="/blog/slug-2" id="to-blog-slug-2">
+        to /blog/slug-2
       </Link>
       <br />
     </div>
diff --git a/test/e2e/middleware-matcher/app/pages/index.js b/test/e2e/middleware-matcher/app/pages/index.js
index d6b60bc0043960..5a99c14917de61 100644
--- a/test/e2e/middleware-matcher/app/pages/index.js
+++ b/test/e2e/middleware-matcher/app/pages/index.js
@@ -5,12 +5,12 @@ export default function Page(props) {
     <div>
       <p id="index">root page</p>
       <p id="props">{JSON.stringify(props)}</p>
-      <Link href="/another-middleware">
-        <a id="to-another-middleware">to /another-middleware</a>
+      <Link href="/another-middleware" id="to-another-middleware">
+        to /another-middleware
       </Link>
       <br />
-      <Link href="/blog/slug-1">
-        <a id="to-blog-slug-1">to /blog/slug-1</a>
+      <Link href="/blog/slug-1" id="to-blog-slug-1">
+        to /blog/slug-1
       </Link>
       <br />
     </div>
diff --git a/test/e2e/middleware-redirects/app/pages/index.js b/test/e2e/middleware-redirects/app/pages/index.js
index 6edd059d955e66..0ca12beb0931ac 100644
--- a/test/e2e/middleware-redirects/app/pages/index.js
+++ b/test/e2e/middleware-redirects/app/pages/index.js
@@ -4,42 +4,38 @@ export default function Home() {
   return (
     <div>
       <p className="title">Home Page</p>
-      <Link href="/old-home">
-        <a id="old-home">Redirect me to a new version of a page</a>
+      <Link href="/old-home" id="old-home">
+        Redirect me to a new version of a page
       </Link>
       <div />
-      <Link href="/old-home?override=external">
-        <a id="old-home-external">Redirect me to an external site</a>
+      <Link href="/old-home?override=external" id="old-home-external">
+        Redirect me to an external site
       </Link>
       <div />
-      <Link href="/blank-page?foo=bar">
-        <a>Redirect me with URL params intact</a>
-      </Link>
+      <Link href="/blank-page?foo=bar">Redirect me with URL params intact</Link>
       <div />
       <Link href="/redirect-to-google">
-        <a>Redirect me to Google (with no body response)</a>
+        Redirect me to Google (with no body response)
       </Link>
       <div />
       <Link href="/redirect-to-google">
-        <a>Redirect me to Google (with no stream response)</a>
+        Redirect me to Google (with no stream response)
       </Link>
       <div />
-      <Link href="/redirect-me-alot">
-        <a>Redirect me alot (chained requests)</a>
-      </Link>
+      <Link href="/redirect-me-alot">Redirect me alot (chained requests)</Link>
       <div />
-      <Link href="/infinite-loop">
-        <a>Redirect me alot (infinite loop)</a>
-      </Link>
+      <Link href="/infinite-loop">Redirect me alot (infinite loop)</Link>
       <div />
-      <Link href="/to?pathname=/api/ok" locale="nl">
-        <a id="link-to-api-with-locale">Redirect me to api with locale</a>
+      <Link
+        href="/to?pathname=/api/ok"
+        locale="nl"
+        id="link-to-api-with-locale"
+      >
+        Redirect me to api with locale
       </Link>
       <div />
-      <Link href="/to?pathname=/old-home">
-        <a id="link-to-to-old-home">
-          Redirect me to a redirecting page of new version of page
-        </a>
+      <Link href="/to?pathname=/old-home" id="link-to-to-old-home">
+        Redirect me to a redirecting page of new version of page
       </Link>
       <div />
     </div>
diff --git a/test/e2e/middleware-responses/app/pages/index.js b/test/e2e/middleware-responses/app/pages/index.js
index caae111a7cf968..e931b33f81eed3 100644
--- a/test/e2e/middleware-responses/app/pages/index.js
+++ b/test/e2e/middleware-responses/app/pages/index.js
@@ -4,60 +4,40 @@ export default function Home({ message }) {
   return (
     <div>
       <p className="title">Hello {message}</p>
-      <Link href="/stream-a-response">
-        <a>Stream a response</a>
-      </Link>
+      <Link href="/stream-a-response">Stream a response</Link>
       <div />
-      <Link href="/stream-long">
-        <a>Stream a long response</a>
-      </Link>
-      <Link href="/stream-end-stream">
-        <a>Test streaming after response ends</a>
-      </Link>
+      <Link href="/stream-long">Stream a long response</Link>
+      <Link href="/stream-end-stream">Test streaming after response ends</Link>
       <div />
       <Link href="/stream-header-end">
-        <a>Attempt to add a header after stream ends</a>
+        Attempt to add a header after stream ends
       </Link>
       <div />
       <Link href="/redirect-stream">
-        <a>Redirect to Google and attempt to stream after</a>
+        Redirect to Google and attempt to stream after
       </Link>
       <div />
-      <Link href="/header">
-        <a>Respond with a header</a>
-      </Link>
+      <Link href="/header">Respond with a header</Link>
       <div />
       <Link href="/header?nested-header=true">
-        <a>Respond with 2 headers (nested middleware effect)</a>
+        Respond with 2 headers (nested middleware effect)
       </Link>
       <div />
-      <Link href="/body-end-header">
-        <a>Respond with body, end, set a header</a>
-      </Link>
+      <Link href="/body-end-header">Respond with body, end, set a header</Link>
       <div />
       <Link href="/body-end-body">
-        <a>Respond with body, end, send another body</a>
+        Respond with body, end, send another body
       </Link>
       <div />
-      <Link href="/send-response">
-        <a>Respond with body</a>
-      </Link>
+      <Link href="/send-response">Respond with body</Link>
       <div />
-      <Link href="/redirect-body">
-        <a>Redirect and then send a body</a>
-      </Link>
+      <Link href="/redirect-body">Redirect and then send a body</Link>
       <div />
-      <Link href="/react">
-        <a>Send React component as a body</a>
-      </Link>
+      <Link href="/react">Send React component as a body</Link>
       <div />
-      <Link href="/react-stream">
-        <a>Stream React component</a>
-      </Link>
+      <Link href="/react-stream">Stream React component</Link>
       <div />
-      <Link href="/bad-status">
-        <a>404</a>
-      </Link>
+      <Link href="/bad-status">404</Link>
       <div />
     </div>
   )
diff --git a/test/e2e/middleware-rewrites/app/pages/fallback-true-blog/[slug].js b/test/e2e/middleware-rewrites/app/pages/fallback-true-blog/[slug].js
index 124d6f15ec34aa..a2aa1488ce505c 100644
--- a/test/e2e/middleware-rewrites/app/pages/fallback-true-blog/[slug].js
+++ b/test/e2e/middleware-rewrites/app/pages/fallback-true-blog/[slug].js
@@ -9,12 +9,16 @@ export default function Page(props) {
   return (
     <>
       <p id="props">{JSON.stringify(props)}</p>
-      <Link href="/fallback-true-blog/first?hello=world" shallow>
-        <a id="to-query-shallow">to /fallback-true-blog/first?hello=world</a>
+      <Link
+        href="/fallback-true-blog/first?hello=world"
+        shallow
+        id="to-query-shallow"
+      >
+        to /fallback-true-blog/first?hello=world
       </Link>
       <br />
-      <Link href="/fallback-true-blog/second" shallow>
-        <a id="to-no-query-shallow">to /fallback-true-blog/second</a>
+      <Link href="/fallback-true-blog/second" shallow id="to-no-query-shallow">
+        to /fallback-true-blog/second
       </Link>
       <br />
     </>
diff --git a/test/e2e/middleware-rewrites/app/pages/i18n.js b/test/e2e/middleware-rewrites/app/pages/i18n.js
index baaa991ff0cc5e..0c3d2b993d27a6 100644
--- a/test/e2e/middleware-rewrites/app/pages/i18n.js
+++ b/test/e2e/middleware-rewrites/app/pages/i18n.js
@@ -6,28 +6,28 @@ export default function Home({ locale }) {
       <div className={locale}>{locale}</div>
       <ul>
         <li>
-          <Link href="/i18n" locale="en">
-            <a id="link-en">Go to en</a>
+          <Link href="/i18n" locale="en" id="link-en">
+            Go to en
           </Link>
         </li>
         <li>
-          <Link href="/en/i18n" locale={false}>
-            <a id="link-en2">Go to en2</a>
+          <Link href="/en/i18n" locale={false} id="link-en2">
+            Go to en2
           </Link>
         </li>
         <li>
-          <Link href="/i18n" locale="ja">
-            <a id="link-ja">Go to ja</a>
+          <Link href="/i18n" locale="ja" id="link-ja">
+            Go to ja
           </Link>
         </li>
         <li>
-          <Link href="/ja/i18n" locale={false}>
-            <a id="link-ja2">Go to ja2</a>
+          <Link href="/ja/i18n" locale={false} id="link-ja2">
+            Go to ja2
           </Link>
         </li>
         <li>
-          <Link href="/i18n" locale="fr">
-            <a id="link-fr">Go to fr</a>
+          <Link href="/i18n" locale="fr" id="link-fr">
+            Go to fr
           </Link>
         </li>
       </ul>
diff --git a/test/e2e/middleware-rewrites/app/pages/index.js b/test/e2e/middleware-rewrites/app/pages/index.js
index 41e8492db83223..817ddf40778c47 100644
--- a/test/e2e/middleware-rewrites/app/pages/index.js
+++ b/test/e2e/middleware-rewrites/app/pages/index.js
@@ -7,48 +7,52 @@ export default function Home() {
     <div>
       <p className="title">Home Page</p>
       <div />
-      <Link href="/rewrite-to-ab-test">
-        <a>A/B test homepage</a>
-      </Link>
+      <Link href="/rewrite-to-ab-test">A/B test homepage</Link>
       <div />
-      <Link href="/rewrite-me-to-about?override=internal">
-        <a id="rewrite-me-to-about">Rewrite me to about</a>
+      <Link
+        href="/rewrite-me-to-about?override=internal"
+        id="rewrite-me-to-about"
+      >
+        Rewrite me to about
       </Link>
       <div />
-      <Link href="/rewrite-to-beforefiles-rewrite">
-        <a id="rewrite-to-beforefiles-rewrite">
-          Rewrite me to beforeFiles Rewrite
-        </a>
+      <Link
+        href="/rewrite-to-beforefiles-rewrite"
+        id="rewrite-to-beforefiles-rewrite"
+      >
+        Rewrite me to beforeFiles Rewrite
       </Link>
       <div />
-      <Link href="/rewrite-to-afterfiles-rewrite">
-        <a id="rewrite-to-afterfiles-rewrite">
-          Rewrite me to afterFiles Rewrite
-        </a>
+      <Link
+        href="/rewrite-to-afterfiles-rewrite"
+        id="rewrite-to-afterfiles-rewrite"
+      >
+        Rewrite me to afterFiles Rewrite
       </Link>
       <div />
-      <Link href="/rewrite-me-to-vercel">
-        <a>Rewrite me to Vercel</a>
-      </Link>
+      <Link href="/rewrite-me-to-vercel">Rewrite me to Vercel</Link>
       <div />
       <Link href="/rewrite-me-external-twice">
-        <a>Redirect me to Vercel (but with double reroutes)</a>
+        Redirect me to Vercel (but with double reroutes)
       </Link>
       <div />
-      <Link href="/rewrite-me-without-hard-navigation?message=refreshed">
-        <a id="link-with-rewritten-url">Rewrite me without a hard navigation</a>
+      <Link
+        href="/rewrite-me-without-hard-navigation?message=refreshed"
+        id="link-with-rewritten-url"
+      >
+        Rewrite me without a hard navigation
       </Link>
       <div />
-      <Link href="/about?override=external">
-        <a id="override-with-external-rewrite">Rewrite me to external site</a>
+      <Link href="/about?override=external" id="override-with-external-rewrite">
+        Rewrite me to external site
       </Link>
       <div />
-      <Link href="/about?override=internal">
-        <a id="override-with-internal-rewrite">Rewrite me to internal path</a>
+      <Link href="/about?override=internal" id="override-with-internal-rewrite">
+        Rewrite me to internal path
       </Link>
       <div />
-      <Link href="/ssg">
-        <a id="normal-ssg-link">normal SSG link</a>
+      <Link href="/ssg" id="normal-ssg-link">
+        normal SSG link
       </Link>
       <div />
       <a
diff --git a/test/e2e/middleware-trailing-slash/app/pages/error.js b/test/e2e/middleware-trailing-slash/app/pages/error.js
index 1b8dc13cadb51e..a5a49734cc0b65 100644
--- a/test/e2e/middleware-trailing-slash/app/pages/error.js
+++ b/test/e2e/middleware-trailing-slash/app/pages/error.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 export default function Errors() {
   return (
     <div>
-      <Link href="/error-throw?message=refreshed">
-        <a id="throw-on-data">Throw on data</a>
+      <Link href="/error-throw?message=refreshed" id="throw-on-data">
+        Throw on data
       </Link>
     </div>
   )
diff --git a/test/e2e/middleware-trailing-slash/app/pages/shallow.js b/test/e2e/middleware-trailing-slash/app/pages/shallow.js
index cd32b9880b7c9a..4d1c8564eee502 100644
--- a/test/e2e/middleware-trailing-slash/app/pages/shallow.js
+++ b/test/e2e/middleware-trailing-slash/app/pages/shallow.js
@@ -8,13 +8,13 @@ export default function Shallow({ message }) {
       <ul>
         <li id="message-contents">{message}</li>
         <li>
-          <Link href="/sha?hello=world" shallow>
-            <a id="shallow-link">Shallow link to ?hello=world</a>
+          <Link href="/sha?hello=world" shallow id="shallow-link">
+            Shallow link to ?hello=world
           </Link>
         </li>
         <li>
-          <Link href="/sha?hello=goodbye">
-            <a id="deep-link">Deep link to ?hello=goodbye</a>
+          <Link href="/sha?hello=goodbye" id="deep-link">
+            Deep link to ?hello=goodbye
           </Link>
         </li>
         <li>
diff --git a/test/e2e/new-link-behavior/app/next.config.js b/test/e2e/new-link-behavior/app/next.config.js
index 0113864670bcf6..4ba52ba2c8df67 100644
--- a/test/e2e/new-link-behavior/app/next.config.js
+++ b/test/e2e/new-link-behavior/app/next.config.js
@@ -1,5 +1 @@
-module.exports = {
-  experimental: {
-    newNextLinkBehavior: true,
-  },
-}
+module.exports = {}
diff --git a/test/e2e/new-link-behavior/material-ui/next.config.js b/test/e2e/new-link-behavior/material-ui/next.config.js
index a472501c6ac7e2..0d6071006ab351 100644
--- a/test/e2e/new-link-behavior/material-ui/next.config.js
+++ b/test/e2e/new-link-behavior/material-ui/next.config.js
@@ -1,6 +1,3 @@
 module.exports = {
   reactStrictMode: true,
-  experimental: {
-    newNextLinkBehavior: true,
-  },
 }
diff --git a/test/e2e/new-link-behavior/stitches/next.config.js b/test/e2e/new-link-behavior/stitches/next.config.js
index a472501c6ac7e2..0d6071006ab351 100644
--- a/test/e2e/new-link-behavior/stitches/next.config.js
+++ b/test/e2e/new-link-behavior/stitches/next.config.js
@@ -1,6 +1,3 @@
 module.exports = {
   reactStrictMode: true,
-  experimental: {
-    newNextLinkBehavior: true,
-  },
 }
diff --git a/test/e2e/new-link-behavior/typescript/next.config.js b/test/e2e/new-link-behavior/typescript/next.config.js
index a472501c6ac7e2..0d6071006ab351 100644
--- a/test/e2e/new-link-behavior/typescript/next.config.js
+++ b/test/e2e/new-link-behavior/typescript/next.config.js
@@ -1,6 +1,3 @@
 module.exports = {
   reactStrictMode: true,
-  experimental: {
-    newNextLinkBehavior: true,
-  },
 }
diff --git a/test/e2e/next-font/with-font-declarations-file/components/roboto-comp.js b/test/e2e/next-font/with-font-declarations-file/components/roboto-comp.js
index 4c58fcd0c139d8..a7f2c05e58a4c0 100644
--- a/test/e2e/next-font/with-font-declarations-file/components/roboto-comp.js
+++ b/test/e2e/next-font/with-font-declarations-file/components/roboto-comp.js
@@ -3,8 +3,8 @@ import { roboto } from '../fonts'
 
 export default function Roboto() {
   return (
-    <Link href="/inter">
-      <a className={roboto.className}>To inter</a>
+    <Link href="/inter" className={roboto.className}>
+      To inter
     </Link>
   )
 }
diff --git a/test/e2e/next-font/with-font-declarations-file/pages/inter.js b/test/e2e/next-font/with-font-declarations-file/pages/inter.js
index 7eafc740bd0285..ca7d532f8add58 100644
--- a/test/e2e/next-font/with-font-declarations-file/pages/inter.js
+++ b/test/e2e/next-font/with-font-declarations-file/pages/inter.js
@@ -3,8 +3,8 @@ import { inter } from '../fonts'
 
 export default function Inter() {
   return (
-    <Link href="/roboto">
-      <a className={inter.className}>To roboto</a>
+    <Link href="/roboto" className={inter.className}>
+      To roboto
     </Link>
   )
 }
diff --git a/test/e2e/prerender/pages/another/index.js b/test/e2e/prerender/pages/another/index.js
index 1504f1edb48441..ab4b9a0fd4287d 100644
--- a/test/e2e/prerender/pages/another/index.js
+++ b/test/e2e/prerender/pages/another/index.js
@@ -19,12 +19,12 @@ export default ({ world, time }) => (
   <>
     <p>hello {world}</p>
     <span id="anotherTime">time: {time}</span>
-    <Link href="/">
-      <a id="home">to home</a>
+    <Link href="/" id="home">
+      to home
     </Link>
     <br />
-    <Link href="/something">
-      <a id="something">to something</a>
+    <Link href="/something" id="something">
+      to something
     </Link>
   </>
 )
diff --git a/test/e2e/prerender/pages/blocking-fallback-once/[slug].js b/test/e2e/prerender/pages/blocking-fallback-once/[slug].js
index 2ef830265aad48..4b2dd2dc4167ee 100644
--- a/test/e2e/prerender/pages/blocking-fallback-once/[slug].js
+++ b/test/e2e/prerender/pages/blocking-fallback-once/[slug].js
@@ -47,8 +47,8 @@ export default ({ post, time, params }) => {
       <span id="time">time: {time}</span>
       <div id="params">{JSON.stringify(params)}</div>
       <div id="query">{JSON.stringify(useRouter().query)}</div>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/e2e/prerender/pages/blocking-fallback-some/[slug].js b/test/e2e/prerender/pages/blocking-fallback-some/[slug].js
index dc89af7f5117e4..4536a8fd565800 100644
--- a/test/e2e/prerender/pages/blocking-fallback-some/[slug].js
+++ b/test/e2e/prerender/pages/blocking-fallback-some/[slug].js
@@ -35,8 +35,8 @@ export default ({ post, time, params }) => {
       <span>time: {time}</span>
       <div id="params">{JSON.stringify(params)}</div>
       <div id="query">{JSON.stringify(useRouter().query)}</div>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/e2e/prerender/pages/blocking-fallback/[slug].js b/test/e2e/prerender/pages/blocking-fallback/[slug].js
index af957a3c98f8c8..e999512dac718e 100644
--- a/test/e2e/prerender/pages/blocking-fallback/[slug].js
+++ b/test/e2e/prerender/pages/blocking-fallback/[slug].js
@@ -64,8 +64,8 @@ export default ({ post, time, params }) => {
       <span id="time">time: {time}</span>
       <div id="params">{JSON.stringify(params)}</div>
       <div id="query">{JSON.stringify(useRouter().query)}</div>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/e2e/prerender/pages/blog/[post]/[comment].js b/test/e2e/prerender/pages/blog/[post]/[comment].js
index 39ee2d9afce5b8..49298a4049a9c2 100644
--- a/test/e2e/prerender/pages/blog/[post]/[comment].js
+++ b/test/e2e/prerender/pages/blog/[post]/[comment].js
@@ -33,8 +33,8 @@ export default ({ post, comment, time }) => {
       <p>Post: {post}</p>
       <p>Comment: {comment}</p>
       <span>time: {time}</span>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/e2e/prerender/pages/blog/[post]/index.js b/test/e2e/prerender/pages/blog/[post]/index.js
index 6f0e3c0ea101e2..85456078750614 100644
--- a/test/e2e/prerender/pages/blog/[post]/index.js
+++ b/test/e2e/prerender/pages/blog/[post]/index.js
@@ -53,8 +53,8 @@ export default ({ post, time, params }) => {
       <span>time: {time}</span>
       <div id="params">{JSON.stringify(params)}</div>
       <div id="query">{JSON.stringify(useRouter().query)}</div>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/e2e/prerender/pages/blog/index.js b/test/e2e/prerender/pages/blog/index.js
index 71ba9e9b1cca01..02907102696854 100644
--- a/test/e2e/prerender/pages/blog/index.js
+++ b/test/e2e/prerender/pages/blog/index.js
@@ -16,8 +16,8 @@ export default ({ slugs, time }) => {
     <>
       <p>Posts: {JSON.stringify(slugs)}</p>
       <span>time: {time}</span>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/e2e/prerender/pages/catchall-explicit/[...slug].js b/test/e2e/prerender/pages/catchall-explicit/[...slug].js
index 103b5650af58b2..6a8448d9756928 100644
--- a/test/e2e/prerender/pages/catchall-explicit/[...slug].js
+++ b/test/e2e/prerender/pages/catchall-explicit/[...slug].js
@@ -35,8 +35,8 @@ export default function Page({ slug, time }) {
     <>
       <p id="catchall">Hi {slug.join(' ')}</p>
       <p id="time">time: {time}</p>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/e2e/prerender/pages/catchall-optional/[[...slug]].js b/test/e2e/prerender/pages/catchall-optional/[[...slug]].js
index 2e613944725c99..a3342e4684a3c4 100644
--- a/test/e2e/prerender/pages/catchall-optional/[[...slug]].js
+++ b/test/e2e/prerender/pages/catchall-optional/[[...slug]].js
@@ -21,8 +21,8 @@ export default ({ slug }) => {
   return (
     <>
       <p id="catchall">Catch all: [{slug.join(', ')}]</p>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/e2e/prerender/pages/default-revalidate.js b/test/e2e/prerender/pages/default-revalidate.js
index 68570ca0ba7233..a044bc159750d3 100644
--- a/test/e2e/prerender/pages/default-revalidate.js
+++ b/test/e2e/prerender/pages/default-revalidate.js
@@ -13,12 +13,12 @@ export default ({ world, time }) => (
   <>
     <p>hello {world}</p>
     <span>time: {time}</span>
-    <Link href="/">
-      <a id="home">to home</a>
+    <Link href="/" id="home">
+      to home
     </Link>
     <br />
-    <Link href="/something">
-      <a id="something">to something</a>
+    <Link href="/something" id="something">
+      to something
     </Link>
   </>
 )
diff --git a/test/e2e/prerender/pages/dynamic/[slug].js b/test/e2e/prerender/pages/dynamic/[slug].js
index 67876322003a91..e6eeea77f3c104 100644
--- a/test/e2e/prerender/pages/dynamic/[slug].js
+++ b/test/e2e/prerender/pages/dynamic/[slug].js
@@ -19,8 +19,8 @@ export default ({ slug }) => {
   return (
     <>
       <p id="param">Hi {slug}!</p>{' '}
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/e2e/prerender/pages/fallback-only/[slug].js b/test/e2e/prerender/pages/fallback-only/[slug].js
index dbb44ed06ce693..57172c74ae22b9 100644
--- a/test/e2e/prerender/pages/fallback-only/[slug].js
+++ b/test/e2e/prerender/pages/fallback-only/[slug].js
@@ -35,8 +35,8 @@ export default ({ post, time, params }) => {
       <span>time: {time}</span>
       <div id="params">{JSON.stringify(params)}</div>
       <div id="query">{JSON.stringify(useRouter().query)}</div>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/e2e/prerender/pages/index.js b/test/e2e/prerender/pages/index.js
index 063d1a7941d87b..a28d2e6bbaa6a1 100644
--- a/test/e2e/prerender/pages/index.js
+++ b/test/e2e/prerender/pages/index.js
@@ -15,76 +15,91 @@ const Page = ({ world, time }) => {
       {/* <div id='after-change'>idk</div> */}
       <p>hello {world}</p>
       <span>time: {time}</span>
-      <Link href="/non-json/[p]" as="/non-json/1">
-        <a id="non-json">to non-json</a>
+      <Link href="/non-json/[p]" as="/non-json/1" id="non-json">
+        to non-json
       </Link>
       <br />
-      <Link href="/another?hello=world" as="/another/?hello=world">
-        <a id="another">to another</a>
+      <Link href="/another?hello=world" as="/another/?hello=world" id="another">
+        to another
       </Link>
       <br />
-      <Link href="/something">
-        <a id="something">to something</a>
+      <Link href="/something" id="something">
+        to something
       </Link>
       <br />
-      <Link href="/normal">
-        <a id="normal">to normal</a>
+      <Link href="/normal" id="normal">
+        to normal
       </Link>
       <br />
-      <Link href="/blog/[post]" as="/blog/post-1">
-        <a id="post-1">to dynamic</a>
+      <Link href="/blog/[post]" as="/blog/post-1" id="post-1">
+        to dynamic
       </Link>
-      <Link href="/blog/[post]" as="/blog/post-100">
-        <a id="broken-post">to broken</a>
+      <Link href="/blog/[post]" as="/blog/post-100" id="broken-post">
+        to broken
       </Link>
-      <Link href="/blog/[post]" as="/blog/post-999" prefetch={false}>
-        <a id="broken-at-first-post">to broken at first</a>
+      <Link
+        href="/blog/[post]"
+        as="/blog/post-999"
+        prefetch={false}
+        id="broken-at-first-post"
+      >
+        to broken at first
       </Link>
       <br />
-      <Link href="/blog/[post]/[comment]" as="/blog/post-1/comment-1">
-        <a id="comment-1">to another dynamic</a>
+      <Link
+        href="/blog/[post]/[comment]"
+        as="/blog/post-1/comment-1"
+        id="comment-1"
+      >
+        to another dynamic
       </Link>
-      <Link href="/catchall/[...slug]" as="/catchall/first">
-        <a id="to-catchall">to catchall</a>
+      <Link href="/catchall/[...slug]" as="/catchall/first" id="to-catchall">
+        to catchall
       </Link>
       <br />
-      <Link href="/index">
-        <a id="to-nested-index">to nested index</a>
+      <Link href="/index" id="to-nested-index">
+        to nested index
       </Link>
       <br />
-      <Link href="/lang/[lang]/about?lang=en" as="/about">
-        <a id="to-rewritten-ssg">to rewritten static path page</a>
+      <Link href="/lang/[lang]/about?lang=en" as="/about" id="to-rewritten-ssg">
+        to rewritten static path page
       </Link>
       <br />
-      <Link href="/catchall-optional/[[...slug]]" as="/catchall-optional">
-        <a id="catchall-optional-root">to optional catchall root</a>
+      <Link
+        href="/catchall-optional/[[...slug]]"
+        as="/catchall-optional"
+        id="catchall-optional-root"
+      >
+        to optional catchall root
       </Link>
-      <Link href="/catchall-optional/[[...slug]]" as="/catchall-optional/value">
-        <a id="catchall-optional-value">to optional catchall page /value</a>
+      <Link
+        href="/catchall-optional/[[...slug]]"
+        as="/catchall-optional/value"
+        id="catchall-optional-value"
+      >
+        to optional catchall page /value
       </Link>
       <br />
-      <Link href="/dynamic/[slug]" as="/dynamic/[first]">
-        <a id="dynamic-first">to dynamic [first] page</a>
+      <Link href="/dynamic/[slug]" as="/dynamic/[first]" id="dynamic-first">
+        to dynamic [first] page
       </Link>
-      <Link href="/dynamic/[slug]" as="/dynamic/[second]">
-        <a id="dynamic-second">to dynamic [second] page</a>
+      <Link href="/dynamic/[slug]" as="/dynamic/[second]" id="dynamic-second">
+        to dynamic [second] page
       </Link>
       <br />
       <Link
         href="/catchall-explicit/[...slug]"
         as="/catchall-explicit/[first]/[second]"
+        id="catchall-explicit-string"
       >
-        <a id="catchall-explicit-string">
-          to catchall-explicit [first]/[second] page
-        </a>
+        to catchall-explicit [first]/[second] page
       </Link>
       <Link
         href="/catchall-explicit/[...slug]"
         as="/catchall-explicit/[third]/[fourth]"
+        id="catchall-explicit-object"
       >
-        <a id="catchall-explicit-object">
-          to catchall-explicit [third]/[fourth] page
-        </a>
+        to catchall-explicit [third]/[fourth] page
       </Link>
     </>
   )
diff --git a/test/e2e/prerender/pages/large-page-data.js b/test/e2e/prerender/pages/large-page-data.js
index 41cb66471a92de..d36eee25b9cb0b 100644
--- a/test/e2e/prerender/pages/large-page-data.js
+++ b/test/e2e/prerender/pages/large-page-data.js
@@ -14,12 +14,12 @@ export default (props) => {
   return (
     <>
       <p>lots of data returned</p>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
       <br />
-      <Link href="/another">
-        <a id="another">to another</a>
+      <Link href="/another" id="another">
+        to another
       </Link>
     </>
   )
diff --git a/test/e2e/prerender/pages/something.js b/test/e2e/prerender/pages/something.js
index 180818998c8d82..d143af67a537cd 100644
--- a/test/e2e/prerender/pages/something.js
+++ b/test/e2e/prerender/pages/something.js
@@ -22,12 +22,12 @@ export default ({ world, time, params, random }) => {
       <div id="random">{random}</div>
       <div id="params">{JSON.stringify(params)}</div>
       <div id="query">{JSON.stringify(useRouter().query)}</div>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
       <br />
-      <Link href="/another">
-        <a id="another">to another</a>
+      <Link href="/another" id="another">
+        to another
       </Link>
     </>
   )
diff --git a/test/e2e/prerender/pages/user/[user]/profile.js b/test/e2e/prerender/pages/user/[user]/profile.js
index 95bf6e7ad7b0da..f6fde9e610b22c 100644
--- a/test/e2e/prerender/pages/user/[user]/profile.js
+++ b/test/e2e/prerender/pages/user/[user]/profile.js
@@ -20,8 +20,8 @@ export default ({ user, time }) => {
     <>
       <p>User: {user}</p>
       <span>time: {time}</span>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/e2e/reload-scroll-backforward-restoration/pages/[id].js b/test/e2e/reload-scroll-backforward-restoration/pages/[id].js
index 3076a7fce7935e..938a4a43f669e9 100644
--- a/test/e2e/reload-scroll-backforward-restoration/pages/[id].js
+++ b/test/e2e/reload-scroll-backforward-restoration/pages/[id].js
@@ -21,17 +21,16 @@ const Page = ({ id }) => {
         }}
       />
       <p>{ready ? 'routeChangeComplete' : 'loading'}</p>
-      <Link href={`/${id + 1}`}>
-        <a
-          id="link"
-          style={{
-            marginLeft: 5000,
-            width: 95000,
-            display: 'block',
-          }}
-        >
-          next page
-        </a>
+      <Link
+        href={`/${id + 1}`}
+        id="link"
+        style={{
+          marginLeft: 5000,
+          width: 95000,
+          display: 'block',
+        }}
+      >
+        next page
       </Link>
       <div id="end-el">hello, world</div>
     </>
diff --git a/test/e2e/skip-trailing-slash-redirect/app/pages/another.js b/test/e2e/skip-trailing-slash-redirect/app/pages/another.js
index 8fa884af1e5e80..b6cb822ba15bbb 100644
--- a/test/e2e/skip-trailing-slash-redirect/app/pages/another.js
+++ b/test/e2e/skip-trailing-slash-redirect/app/pages/another.js
@@ -4,8 +4,8 @@ export default function Page(props) {
   return (
     <>
       <p id="another">another page</p>
-      <Link href="/">
-        <a id="to-index">to index</a>
+      <Link href="/" id="to-index">
+        to index
       </Link>
       <br />
     </>
diff --git a/test/e2e/skip-trailing-slash-redirect/app/pages/blog/[slug].js b/test/e2e/skip-trailing-slash-redirect/app/pages/blog/[slug].js
index 4e988b3acf0bd8..d981ff9ea3a826 100644
--- a/test/e2e/skip-trailing-slash-redirect/app/pages/blog/[slug].js
+++ b/test/e2e/skip-trailing-slash-redirect/app/pages/blog/[slug].js
@@ -4,8 +4,8 @@ export default function Page(props) {
   return (
     <>
       <p id="blog">blog page</p>
-      <Link href="/">
-        <a id="to-index">to index</a>
+      <Link href="/" id="to-index">
+        to index
       </Link>
       <br />
     </>
diff --git a/test/e2e/skip-trailing-slash-redirect/app/pages/index.js b/test/e2e/skip-trailing-slash-redirect/app/pages/index.js
index ff064e7ab56b9f..04fbd07fee5b13 100644
--- a/test/e2e/skip-trailing-slash-redirect/app/pages/index.js
+++ b/test/e2e/skip-trailing-slash-redirect/app/pages/index.js
@@ -4,12 +4,12 @@ export default function Page(props) {
   return (
     <>
       <p id="index">index page</p>
-      <Link href="/another">
-        <a id="to-another">to another</a>
+      <Link href="/another" id="to-another">
+        to another
       </Link>
       <br />
-      <Link href="/blog/first">
-        <a id="to-blog-first">to /blog/first</a>
+      <Link href="/blog/first" id="to-blog-first">
+        to /blog/first
       </Link>
       <br />
     </>
diff --git a/test/e2e/streaming-ssr/streaming-ssr/pages/hello.js b/test/e2e/streaming-ssr/streaming-ssr/pages/hello.js
index 63dc74af950f16..10d52a4a220652 100644
--- a/test/e2e/streaming-ssr/streaming-ssr/pages/hello.js
+++ b/test/e2e/streaming-ssr/streaming-ssr/pages/hello.js
@@ -4,9 +4,7 @@ export default function Page() {
   return (
     <div>
       <p>hello nextjs</p>
-      <Link href="/">
-        <a>home</a>
-      </Link>
+      <Link href="/">home</Link>
     </div>
   )
 }
diff --git a/test/e2e/switchable-runtime/pages/node.js b/test/e2e/switchable-runtime/pages/node.js
index d0857a09aebaaa..889e58523bef33 100644
--- a/test/e2e/switchable-runtime/pages/node.js
+++ b/test/e2e/switchable-runtime/pages/node.js
@@ -12,28 +12,28 @@ export default function Page() {
       <br />
       <Time />
       <br />
-      <Link href="/node-rsc">
-        <a id="link-node-rsc">to /node-rsc</a>
+      <Link href="/node-rsc" id="link-node-rsc">
+        to /node-rsc
       </Link>
       <br />
-      <Link href="/node-rsc-ssg">
-        <a id="link-node-rsc-ssg">to /node-rsc-ssg</a>
+      <Link href="/node-rsc-ssg" id="link-node-rsc-ssg">
+        to /node-rsc-ssg
       </Link>
       <br />
-      <Link href="/node-rsc-ssr">
-        <a id="link-node-rsc-ssr">to /node-rsc-ssr</a>
+      <Link href="/node-rsc-ssr" id="link-node-rsc-ssr">
+        to /node-rsc-ssr
       </Link>
       <br />
-      <Link href="/node-rsc-isr">
-        <a id="link-node-rsc-isr">to /node-rsc-isr</a>
+      <Link href="/node-rsc-isr" id="link-node-rsc-isr">
+        to /node-rsc-isr
       </Link>
       <br />
-      <Link href="/node-ssg">
-        <a id="link-node-ssg">to /node-ssg</a>
+      <Link href="/node-ssg" id="link-node-ssg">
+        to /node-ssg
       </Link>
       <br />
-      <Link href="/node-ssr">
-        <a id="link-node-ssr">to /node-ssr</a>
+      <Link href="/node-ssr" id="link-node-ssr">
+        to /node-ssr
       </Link>
     </div>
   )
diff --git a/test/e2e/type-module-interop/index.test.ts b/test/e2e/type-module-interop/index.test.ts
index 75aeafbfcf4ef1..5e1043d7caba37 100644
--- a/test/e2e/type-module-interop/index.test.ts
+++ b/test/e2e/type-module-interop/index.test.ts
@@ -37,8 +37,8 @@ describe('Type module interop', () => {
                 <p>hello world</p>
                 <Dynamic />
                 <p id="isAmp">isAmp: {isAmp ? 'yes' : 'false'}</p>
-                <Link href="/modules">
-                  <a id="link-to-module">link to module</a>
+                <Link href="/modules" id="link-to-module">
+                  link to module
                 </Link>
               </>
             )
@@ -51,8 +51,8 @@ describe('Type module interop', () => {
           export default function Modules() {
             return (
               <>
-                <Link href="/">
-                  <a id="link-to-home">link to home</a>
+                <Link href="/" id="link-to-home">
+                  link to home
                 </Link>
                 <Image src="/static/image.png" width="100" height="100" />
               </>
diff --git a/test/integration/absolute-assetprefix/pages/index.js b/test/integration/absolute-assetprefix/pages/index.js
index 3f9ea93e3ef9bc..1a75a14a462f98 100644
--- a/test/integration/absolute-assetprefix/pages/index.js
+++ b/test/integration/absolute-assetprefix/pages/index.js
@@ -3,20 +3,28 @@ import Link from 'next/link'
 export default function Page() {
   return (
     <>
-      <Link href="/about">
-        <a id="about-link">getStaticProps</a>
+      <Link href="/about" id="about-link">
+        getStaticProps
       </Link>
       <br />
-      <Link href="/gsp-fallback/[slug]" as="/gsp-fallback/prerendered">
-        <a id="gsp-prerender-link">getStaticPaths prerendered</a>
+      <Link
+        href="/gsp-fallback/[slug]"
+        as="/gsp-fallback/prerendered"
+        id="gsp-prerender-link"
+      >
+        getStaticPaths prerendered
       </Link>
       <br />
-      <Link href="/gsp-fallback/[slug]" as="/gsp-fallback/fallback">
-        <a id="gsp-fallback-link">getStaticPaths fallback</a>
+      <Link
+        href="/gsp-fallback/[slug]"
+        as="/gsp-fallback/fallback"
+        id="gsp-fallback-link"
+      >
+        getStaticPaths fallback
       </Link>
       <br />
-      <Link href="/gssp?prop=foo">
-        <a id="gssp-link">getServerSideProps</a>
+      <Link href="/gssp?prop=foo" id="gssp-link">
+        getServerSideProps
       </Link>
     </>
   )
diff --git a/test/integration/amphtml/pages/nav.js b/test/integration/amphtml/pages/nav.js
index 2cc684c0dca30d..ebc1771db14ec1 100644
--- a/test/integration/amphtml/pages/nav.js
+++ b/test/integration/amphtml/pages/nav.js
@@ -8,13 +8,13 @@ export default function Nav() {
   return (
     <ul>
       <li>
-        <Link href="/only-amp">
-          <a id="only-amp-link">AMP First Page</a>
+        <Link href="/only-amp" id="only-amp-link">
+          AMP First Page
         </Link>
       </li>
       <li>
-        <Link href="/var-before-export">
-          <a id="var-before-export-link">Another AMP First Page</a>
+        <Link href="/var-before-export" id="var-before-export-link">
+          Another AMP First Page
         </Link>
       </li>
     </ul>
diff --git a/test/integration/amphtml/pages/normal.js b/test/integration/amphtml/pages/normal.js
index deca2ae138101a..85762ddb85c1ac 100644
--- a/test/integration/amphtml/pages/normal.js
+++ b/test/integration/amphtml/pages/normal.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 export default () => (
   <div>
     <p>No AMP for me...</p>
-    <Link href="/only-amp">
-      <a id="to-amp">To AMP page!</a>
+    <Link href="/only-amp" id="to-amp">
+      To AMP page!
     </Link>
   </div>
 )
diff --git a/test/integration/app-document/pages/about.js b/test/integration/app-document/pages/about.js
index fa2dbc2ad5ae4c..329db6b4aa7128 100644
--- a/test/integration/app-document/pages/about.js
+++ b/test/integration/app-document/pages/about.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 export default () => (
   <div>
     <div className="page-about">about</div>
-    <Link href="/">
-      <a id="home-link">home</a>
+    <Link href="/" id="home-link">
+      home
     </Link>
   </div>
 )
diff --git a/test/integration/app-document/pages/index.js b/test/integration/app-document/pages/index.js
index f21ecbe1dd7a48..1a67dbf027ef19 100644
--- a/test/integration/app-document/pages/index.js
+++ b/test/integration/app-document/pages/index.js
@@ -3,8 +3,8 @@ export default () => (
   <div>
     <div className="page-index">index</div>
     <span className="css-in-js-class" />
-    <Link href="/about">
-      <a id="about-link">about</a>
+    <Link href="/about" id="about-link">
+      about
     </Link>
     <span className="css-in-js-class" />
   </div>
diff --git a/test/integration/app-tree/pages/_app.tsx b/test/integration/app-tree/pages/_app.tsx
index bcd7a5546e8ab5..d4b05ca25443e9 100644
--- a/test/integration/app-tree/pages/_app.tsx
+++ b/test/integration/app-tree/pages/_app.tsx
@@ -38,8 +38,8 @@ export default class MyApp extends App<{ html: string }> {
       html && router.pathname !== '/hello' ? (
         <>
           <div dangerouslySetInnerHTML={{ __html: html }} />
-          <Link href={href}>
-            <a id={href === '/' ? 'home' : 'another'}>to {href}</a>
+          <Link href={href} id={href === '/' ? 'home' : 'another'}>
+            to{href}
           </Link>
         </>
       ) : (
diff --git a/test/integration/basepath-root-catch-all/pages/hello.js b/test/integration/basepath-root-catch-all/pages/hello.js
index 0b043d1e5fd26d..51a73fd4e95903 100644
--- a/test/integration/basepath-root-catch-all/pages/hello.js
+++ b/test/integration/basepath-root-catch-all/pages/hello.js
@@ -1,7 +1,7 @@
 import Link from 'next/link'
 
 export default () => (
-  <Link href="/[...parts]" as="/root/catch-all">
-    <a id="root-catchall-link">root catch-all</a>
+  <Link href="/[...parts]" as="/root/catch-all" id="root-catchall-link">
+    root catch-all
   </Link>
 )
diff --git a/test/integration/build-indicator/pages/index.js b/test/integration/build-indicator/pages/index.js
index b810ac290b56cf..db0a7a5f4c3e1a 100644
--- a/test/integration/build-indicator/pages/index.js
+++ b/test/integration/build-indicator/pages/index.js
@@ -3,11 +3,11 @@ import Link from 'next/link'
 export default function Page() {
   return (
     <>
-      <Link href="/a">
-        <a id="to-a">Go to a</a>
+      <Link href="/a" id="to-a">
+        Go to a
       </Link>
-      <Link href="/b">
-        <a id="to-b">Go to b</a>
+      <Link href="/b" id="to-b">
+        Go to b
       </Link>
     </>
   )
diff --git a/test/integration/chunking/pages/page3.js b/test/integration/chunking/pages/page3.js
index a49f3544a69617..3621e80eb76752 100644
--- a/test/integration/chunking/pages/page3.js
+++ b/test/integration/chunking/pages/page3.js
@@ -7,8 +7,8 @@ const Page = () => {
   return (
     <div>
       <h2>Page3</h2>
-      <Link href="/page2">
-        <a id="page2-link">Page2</a>
+      <Link href="/page2" id="page2-link">
+        Page2
       </Link>
     </div>
   )
diff --git a/test/integration/client-404/pages/_error.js b/test/integration/client-404/pages/_error.js
index a7cf777b9e217f..e8d0efef77e02b 100644
--- a/test/integration/client-404/pages/_error.js
+++ b/test/integration/client-404/pages/_error.js
@@ -13,8 +13,8 @@ export default class Error extends React.Component {
       <div>
         <div id="errorStatusCode">{this.props.statusCode || 'unknown'}</div>
         <p>
-          <Link href="/">
-            <a id="errorGoHome">go home</a>
+          <Link href="/" id="errorGoHome">
+            go home
           </Link>
         </p>
       </div>
diff --git a/test/integration/client-404/pages/invalid-link.js b/test/integration/client-404/pages/invalid-link.js
index 841840464a5284..7809e8c545a0cc 100644
--- a/test/integration/client-404/pages/invalid-link.js
+++ b/test/integration/client-404/pages/invalid-link.js
@@ -1,7 +1,11 @@
 import Link from 'next/link'
 
 export default () => (
-  <Link href="/[id]/non-existent" as="/another/non-existent">
-    <a id="to-nonexistent">to 404</a>
+  <Link
+    href="/[id]/non-existent"
+    as="/another/non-existent"
+    id="to-nonexistent"
+  >
+    to 404
   </Link>
 )
diff --git a/test/integration/client-404/pages/to-missing-link.js b/test/integration/client-404/pages/to-missing-link.js
index 0e6034013edc6a..d18ecf67019980 100644
--- a/test/integration/client-404/pages/to-missing-link.js
+++ b/test/integration/client-404/pages/to-missing-link.js
@@ -1,7 +1,7 @@
 import Link from 'next/link'
 
 export default () => (
-  <Link href="/missing">
-    <a id="to-missing">to 404</a>
+  <Link href="/missing" id="to-missing">
+    to 404
   </Link>
 )
diff --git a/test/integration/client-navigation-a11y/pages/index.js b/test/integration/client-navigation-a11y/pages/index.js
index 04ed7407e7d219..60029368130de7 100644
--- a/test/integration/client-navigation-a11y/pages/index.js
+++ b/test/integration/client-navigation-a11y/pages/index.js
@@ -2,26 +2,20 @@ import Link from 'next/link'
 
 export default () => (
   <div id="page-container">
-    <Link href="/page-with-h1-and-title">
-      <a id="page-with-h1-and-title-link">
-        Go to a page with a title and an h1
-      </a>
+    <Link href="/page-with-h1-and-title" id="page-with-h1-and-title-link">
+      Go to a page with a title and an h1
     </Link>
 
-    <Link href="/page-with-h1">
-      <a id="page-with-h1-link">Go to a page without a title but with an h1</a>
+    <Link href="/page-with-h1" id="page-with-h1-link">
+      Go to a page without a title but with an h1
     </Link>
 
-    <Link href="/page-with-title">
-      <a id="page-with-title-link">
-        Go to a page without an h1, but with a title
-      </a>
+    <Link href="/page-with-title" id="page-with-title-link">
+      Go to a page without an h1, but with a title
     </Link>
 
-    <Link href="/page-without-h1-or-title">
-      <a id="page-without-h1-or-title-link">
-        Go to a page without an h1 or a title
-      </a>
+    <Link href="/page-without-h1-or-title" id="page-without-h1-or-title-link">
+      Go to a page without an h1 or a title
     </Link>
   </div>
 )
diff --git a/test/integration/client-navigation/pages/absolute-url.js b/test/integration/client-navigation/pages/absolute-url.js
index fad88f945f070d..73468a7fab1759 100644
--- a/test/integration/client-navigation/pages/absolute-url.js
+++ b/test/integration/client-navigation/pages/absolute-url.js
@@ -15,8 +15,8 @@ export default function Page({ port }) {
 
   return (
     <>
-      <Link href="https://vercel.com/">
-        <a id="absolute-link">https://vercel.com/</a>
+      <Link href="https://vercel.com/" id="absolute-link">
+        https://vercel.com/
       </Link>
       <br />
       <button
@@ -33,17 +33,19 @@ export default function Page({ port }) {
         replace https://vercel.com/
       </button>
       <br />
-      <Link href={`http://localhost:${port}/nav/about`}>
-        <a id="absolute-local-link">http://localhost:{port}/nav/about</a>
+      <Link
+        href={`http://localhost:${port}/nav/about`}
+        id="absolute-local-link"
+      >
+        http://localhost:{port}/nav/about
       </Link>
       <br />
       <Link
         href={`http://localhost:${port}/dynamic/[slug]/route`}
         as={`http://localhost:${port}/dynamic/hello/route`}
+        id="absolute-local-dynamic-link"
       >
-        <a id="absolute-local-dynamic-link">
-          http://localhost:{port}/dynamic/hello/route
-        </a>
+        http://localhost:{port}/dynamic/hello/route
       </Link>
       <br />
       <button
@@ -60,19 +62,18 @@ export default function Page({ port }) {
         replace http://localhost:{port}/nav/about
       </button>
       <br />
-      <Link href="mailto:idk@idk.com">
-        <a id="mailto-link">mailto:idk@idk.com</a>
+      <Link href="mailto:idk@idk.com" id="mailto-link">
+        mailto:idk@idk.com
       </Link>
       <br />
-      <Link href="https://vercel.com/">
-        <a
-          id="absolute-link-mouse-events"
-          data-hover={hover}
-          onMouseEnter={() => setHover(true)}
-          onMouseLeave={() => setHover(false)}
-        >
-          https://vercel.com/
-        </a>
+      <Link
+        href="https://vercel.com/"
+        id="absolute-link-mouse-events"
+        data-hover={hover}
+        onMouseEnter={() => setHover(true)}
+        onMouseLeave={() => setHover(false)}
+      >
+        https://vercel.com/
       </Link>
     </>
   )
diff --git a/test/integration/client-navigation/pages/link-invalid-onclick.js b/test/integration/client-navigation/pages/link-invalid-onclick.js
index 7cebe86d2895df..ec3cbacef36d5b 100644
--- a/test/integration/client-navigation/pages/link-invalid-onclick.js
+++ b/test/integration/client-navigation/pages/link-invalid-onclick.js
@@ -27,7 +27,7 @@ export default function Page(props) {
   return (
     <>
       <p id="errors">{errorCount}</p>
-      <Link href="/nav" passHref>
+      <Link href="/nav" passHref legacyBehavior>
         <Button />
       </Link>
     </>
diff --git a/test/integration/client-navigation/pages/link-no-child.js b/test/integration/client-navigation/pages/link-no-child.js
index e3786f932ee781..082663f8fcf5e4 100644
--- a/test/integration/client-navigation/pages/link-no-child.js
+++ b/test/integration/client-navigation/pages/link-no-child.js
@@ -4,7 +4,7 @@ import Link from 'next/link'
 export default function Page() {
   return (
     <div>
-      Hello World. <Link href="/about"></Link>
+      Hello World. <Link href="/about" legacyBehavior></Link>
     </div>
   )
 }
diff --git a/test/integration/client-navigation/pages/link-number-child.js b/test/integration/client-navigation/pages/link-number-child.js
index 58feab841e3587..a367a4e01dda16 100644
--- a/test/integration/client-navigation/pages/link-number-child.js
+++ b/test/integration/client-navigation/pages/link-number-child.js
@@ -4,7 +4,10 @@ import Link from 'next/link'
 export default function Page() {
   return (
     <div>
-      Hello World. <Link href="/about">{1000}</Link>
+      Hello World.{' '}
+      <Link href="/about" legacyBehavior>
+        {1000}
+      </Link>
     </div>
   )
 }
diff --git a/test/integration/client-navigation/pages/link.js b/test/integration/client-navigation/pages/link.js
index 20677095eb3f15..571456e63f2f88 100644
--- a/test/integration/client-navigation/pages/link.js
+++ b/test/integration/client-navigation/pages/link.js
@@ -2,9 +2,6 @@ import React from 'react'
 import Link from 'next/link'
 export default () => (
   <div>
-    Hello World.{' '}
-    <Link href="/about">
-      <a>About</a>
-    </Link>
+    Hello World. <Link href="/about">About</Link>
   </div>
 )
diff --git a/test/integration/client-navigation/pages/nav/about.js b/test/integration/client-navigation/pages/nav/about.js
index c0888e00f5ea98..12757152bfa2d6 100644
--- a/test/integration/client-navigation/pages/nav/about.js
+++ b/test/integration/client-navigation/pages/nav/about.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export default () => (
   <div className="nav-about">
-    <Link href="/nav">
-      <a id="home-link">Go Back</a>
+    <Link href="/nav" id="home-link">
+      Go Back
     </Link>
 
     <p>This is the about page.</p>
diff --git a/test/integration/client-navigation/pages/nav/as-path-pushstate.js b/test/integration/client-navigation/pages/nav/as-path-pushstate.js
index 0ed4a9976f280a..ac930dd6b2f907 100644
--- a/test/integration/client-navigation/pages/nav/as-path-pushstate.js
+++ b/test/integration/client-navigation/pages/nav/as-path-pushstate.js
@@ -9,26 +9,32 @@ export default withRouter(({ router: { asPath, query } }) => {
         <Link
           href="/nav/as-path-pushstate?something=hello"
           as="/something/hello"
+          id="hello"
         >
-          <a id="hello">hello</a>
+          hello
         </Link>
       </div>
       <div>
-        <Link href="/nav/as-path-pushstate" as="/something/else">
-          <a id="else">else</a>
+        <Link href="/nav/as-path-pushstate" as="/something/else" id="else">
+          else
         </Link>
       </div>
       <div>
-        <Link href="/nav/as-path-pushstate" as="/nav/as-path-pushstate">
-          <a id="hello2">normal hello</a>
+        <Link
+          href="/nav/as-path-pushstate"
+          as="/nav/as-path-pushstate"
+          id="hello2"
+        >
+          normal hello
         </Link>
       </div>
       {query.something === 'hello' && (
         <Link
           href="/nav/as-path-pushstate?something=hello"
           as="/something/same-query"
+          id="same-query"
         >
-          <a id="same-query">same query</a>
+          same query
         </Link>
       )}
     </div>
diff --git a/test/integration/client-navigation/pages/nav/as-path-query.js b/test/integration/client-navigation/pages/nav/as-path-query.js
index 4536ce5996ddb2..92d178c3b9b9a6 100644
--- a/test/integration/client-navigation/pages/nav/as-path-query.js
+++ b/test/integration/client-navigation/pages/nav/as-path-query.js
@@ -15,16 +15,18 @@ export default withRouter(({ router: { asPath, query } }) => {
         <Link
           href="/nav/as-path-query?something=hello"
           as="/something/hello?something=hello"
+          id="hello"
         >
-          <a id="hello">hello</a>
+          hello
         </Link>
       </div>
       <div>
         <Link
           href="/nav/as-path-query?something=else"
           as="/something/hello?something=else"
+          id="hello2"
         >
-          <a id="hello2">hello</a>
+          hello
         </Link>
       </div>
     </div>
diff --git a/test/integration/client-navigation/pages/nav/hash-changes.js b/test/integration/client-navigation/pages/nav/hash-changes.js
index ab7671ebc6c004..6a7e870765cc1f 100644
--- a/test/integration/client-navigation/pages/nav/hash-changes.js
+++ b/test/integration/client-navigation/pages/nav/hash-changes.js
@@ -9,31 +9,33 @@ const HashChanges = ({ count }) => {
 
   return (
     <div id="hash-changes-page">
-      <Link href="#via-link">
-        <a id="via-link">Via Link</a>
+      <Link href="#via-link" id="via-link">
+        Via Link
       </Link>
       <a href="#via-a" id="via-a">
         Via A
       </a>
-      <Link href="/nav/hash-changes">
-        <a id="page-url">Page URL</a>
+      <Link href="/nav/hash-changes" id="page-url">
+        Page URL
       </Link>
-      <Link href="#">
-        <a id="via-empty-hash">Via Empty Hash</a>
+      <Link href="#" id="via-empty-hash">
+        Via Empty Hash
       </Link>
-      <Link href="#item-400">
-        <a id="scroll-to-item-400">Go to item 400</a>
+      <Link href="#item-400" id="scroll-to-item-400">
+        Go to item 400
       </Link>
-      <Link href="#name-item-400">
-        <a id="scroll-to-name-item-400">Go to name item 400</a>
+      <Link href="#name-item-400" id="scroll-to-name-item-400">
+        Go to name item 400
       </Link>
-      <Link href="#name-item-400" scroll={false}>
-        <a id="scroll-to-name-item-400-no-scroll">
-          Go to name item 400 (no scroll)
-        </a>
+      <Link
+        href="#name-item-400"
+        scroll={false}
+        id="scroll-to-name-item-400-no-scroll"
+      >
+        Go to name item 400 (no scroll)
       </Link>
-      <Link href="#中文">
-        <a id="scroll-to-cjk-anchor">Go to CJK anchor</a>
+      <Link href="#中文" id="scroll-to-cjk-anchor">
+        Go to CJK anchor
       </Link>
       <p>COUNT: {count}</p>
       {Array.from({ length: 500 }, (x, i) => i + 1).map((i) => {
@@ -50,8 +52,8 @@ const HashChanges = ({ count }) => {
           </div>
         )
       })}
-      <Link href="#top">
-        <a id="via-top-hash">Via Top Hash</a>
+      <Link href="#top" id="via-top-hash">
+        Via Top Hash
       </Link>
       <div id="asPath">ASPATH: {router.asPath}</div>
       <div id="pathname">PATHNAME: {router.pathname}</div>
diff --git a/test/integration/client-navigation/pages/nav/head-1.js b/test/integration/client-navigation/pages/nav/head-1.js
index 193784d6b3dc21..d1726129fd9c92 100644
--- a/test/integration/client-navigation/pages/nav/head-1.js
+++ b/test/integration/client-navigation/pages/nav/head-1.js
@@ -8,11 +8,11 @@ export default (props) => (
       <meta name="description" content="Head One" />
       <title>this is head-1</title>
     </Head>
-    <Link href="/nav/head-2">
-      <a id="to-head-2">to head 2</a>
+    <Link href="/nav/head-2" id="to-head-2">
+      to head 2
     </Link>
-    <Link href="/nav/head-3">
-      <a id="to-head-3">to head 3</a>
+    <Link href="/nav/head-3" id="to-head-3">
+      to head 3
     </Link>
   </div>
 )
diff --git a/test/integration/client-navigation/pages/nav/head-2.js b/test/integration/client-navigation/pages/nav/head-2.js
index e0d29a74dac382..9c915313d89036 100644
--- a/test/integration/client-navigation/pages/nav/head-2.js
+++ b/test/integration/client-navigation/pages/nav/head-2.js
@@ -8,8 +8,8 @@ export default (props) => (
       <meta name="description" content="Head Two" />
       <title>this is head-2</title>
     </Head>
-    <Link href="/nav/head-1">
-      <a id="to-head-1">to head 1</a>
+    <Link href="/nav/head-1" id="to-head-1">
+      to head 1
     </Link>
   </div>
 )
diff --git a/test/integration/client-navigation/pages/nav/head-3.js b/test/integration/client-navigation/pages/nav/head-3.js
index 218e5369d75f69..d66d2060130fbf 100644
--- a/test/integration/client-navigation/pages/nav/head-3.js
+++ b/test/integration/client-navigation/pages/nav/head-3.js
@@ -8,8 +8,8 @@ export default (props) => (
       <meta name="description" content="Head Three" />
       <title></title>
     </Head>
-    <Link href="/nav/head-1">
-      <a id="to-head-1">to head 1</a>
+    <Link href="/nav/head-1" id="to-head-1">
+      to head 1
     </Link>
   </div>
 )
diff --git a/test/integration/client-navigation/pages/nav/index.js b/test/integration/client-navigation/pages/nav/index.js
index 33d7f08227e53c..1bad1ccfc63633 100644
--- a/test/integration/client-navigation/pages/nav/index.js
+++ b/test/integration/client-navigation/pages/nav/index.js
@@ -23,68 +23,68 @@ export default class extends Component {
   render() {
     return (
       <div className="nav-home">
-        <Link href="/nav/about">
-          <a id="about-link" style={linkStyle}>
-            About
-          </a>
+        <Link href="/nav/about" id="about-link" style={linkStyle}>
+          About
         </Link>
-        <Link href="/empty-get-initial-props">
-          <a id="empty-props" style={linkStyle}>
-            Empty Props
-          </a>
+        <Link
+          href="/empty-get-initial-props"
+          id="empty-props"
+          style={linkStyle}
+        >
+          Empty Props
         </Link>
-        <Link href="/nav/self-reload">
-          <a id="self-reload-link" style={linkStyle}>
-            Self Reload
-          </a>
+        <Link href="/nav/self-reload" id="self-reload-link" style={linkStyle}>
+          Self Reload
         </Link>
-        <Link href="/nav/shallow-routing">
-          <a id="shallow-routing-link" style={linkStyle}>
-            Shallow Routing
-          </a>
+        <Link
+          href="/nav/shallow-routing"
+          id="shallow-routing-link"
+          style={linkStyle}
+        >
+          Shallow Routing
         </Link>
-        <Link href="/nav/redirect">
-          <a id="redirect-link" style={linkStyle}>
-            Redirect
-          </a>
+        <Link href="/nav/redirect" id="redirect-link" style={linkStyle}>
+          Redirect
         </Link>
         <Link
           href={{ pathname: '/nav/querystring', query: { id: 10 } }}
           as={{ pathname: '/nav/querystring/10', hash: '10' }}
+          id="query-string-link"
+          style={linkStyle}
         >
-          <a id="query-string-link" style={linkStyle}>
-            QueryString
-          </a>
+          QueryString
         </Link>
-        <Link href="/nav/about" replace>
-          <a id="about-replace-link" style={linkStyle}>
-            Replace state
-          </a>
+        <Link
+          href="/nav/about"
+          replace
+          id="about-replace-link"
+          style={linkStyle}
+        >
+          Replace state
         </Link>
-        <Link href="/nav/as-path" as="/as/path">
-          <a id="as-path-link" style={linkStyle}>
-            As Path
-          </a>
+        <Link
+          href="/nav/as-path"
+          as="/as/path"
+          id="as-path-link"
+          style={linkStyle}
+        >
+          As Path
         </Link>
-        <Link href="/nav/as-path">
-          <a id="as-path-link-no-as" style={linkStyle}>
-            As Path (No as)
-          </a>
+        <Link href="/nav/as-path" id="as-path-link-no-as" style={linkStyle}>
+          As Path (No as)
         </Link>
-        <Link href="/nav/as-path-using-router">
-          <a id="as-path-using-router-link" style={linkStyle}>
-            As Path (Using Router)
-          </a>
+        <Link
+          href="/nav/as-path-using-router"
+          id="as-path-using-router-link"
+          style={linkStyle}
+        >
+          As Path (Using Router)
         </Link>
-        <Link href="/nav/on-click?count=1">
-          <a id="on-click-link" style={linkStyle}>
-            An element with onClick
-          </a>
+        <Link href="/nav/on-click?count=1" id="on-click-link" style={linkStyle}>
+          An element with onClick
         </Link>
-        <Link href="/nav/about">
-          <a id="target-link" target="_blank">
-            An element with target
-          </a>
+        <Link href="/nav/about" id="target-link" target="_blank">
+          An element with target
         </Link>
 
         <svg
@@ -93,15 +93,13 @@ export default class extends Component {
           fill="none"
           xmlns="http://www.w3.org/2000/svg"
         >
-          <Link href="/nav/about">
-            <a id="in-svg-link" style={{ display: 'block' }}>
-              <path
-                fillRule="evenodd"
-                clipRule="evenodd"
-                d="M12 0C5.373 0 0 5.373 0 12s5.373 12 12 12 12-5.373 12-12S18.627 0 12 0Zm4.5 18a4 4 0 1 0 0-8 4 4 0 0 0 0 8Z"
-                fill="#335BF1"
-              />
-            </a>
+          <Link href="/nav/about" id="in-svg-link" style={{ display: 'block' }}>
+            <path
+              fillRule="evenodd"
+              clipRule="evenodd"
+              d="M12 0C5.373 0 0 5.373 0 12s5.373 12 12 12 12-5.373 12-12S18.627 0 12 0Zm4.5 18a4 4 0 1 0 0-8 4 4 0 0 0 0 8Z"
+              fill="#335BF1"
+            />
           </Link>
         </svg>
 
@@ -118,11 +116,11 @@ export default class extends Component {
         <button id="increase" onClick={() => this.increase()}>
           Increase
         </button>
-        <Link href="/nav/hash-changes#item-400">
-          <a id="scroll-to-hash">Scroll to hash</a>
+        <Link href="/nav/hash-changes#item-400" id="scroll-to-hash">
+          Scroll to hash
         </Link>
-        <Link href="/nav/hash-changes#中文">
-          <a id="scroll-to-cjk-hash">Scroll to CJK hash</a>
+        <Link href="/nav/hash-changes#中文" id="scroll-to-cjk-hash">
+          Scroll to CJK hash
         </Link>
       </div>
     )
diff --git a/test/integration/client-navigation/pages/nav/long-page-to-snap-scroll.js b/test/integration/client-navigation/pages/nav/long-page-to-snap-scroll.js
index 1383a6c78b948a..6292251a323e51 100644
--- a/test/integration/client-navigation/pages/nav/long-page-to-snap-scroll.js
+++ b/test/integration/client-navigation/pages/nav/long-page-to-snap-scroll.js
@@ -6,8 +6,8 @@ const LongPageToSnapScroll = () => {
   const router = useRouter()
   return (
     <div id="long-page-to-snap-scroll">
-      <Link href="#item-400">
-        <a id="scroll-to-item-400">Go to item 400</a>
+      <Link href="#item-400" id="scroll-to-item-400">
+        Go to item 400
       </Link>
 
       {Array.from({ length: 500 }, (x, i) => i + 1).map((i) => {
@@ -18,8 +18,8 @@ const LongPageToSnapScroll = () => {
         )
       })}
 
-      <Link href="/snap-scroll-position">
-        <a id="goto-snap-scroll-position">Go to snap scroll declarative</a>
+      <Link href="/snap-scroll-position" id="goto-snap-scroll-position">
+        Go to snap scroll declarative
       </Link>
       <div
         id="goto-snap-scroll-position-imperative"
diff --git a/test/integration/client-navigation/pages/nav/on-click.js b/test/integration/client-navigation/pages/nav/on-click.js
index 401f54f0d418a3..654859049abc9e 100644
--- a/test/integration/client-navigation/pages/nav/on-click.js
+++ b/test/integration/client-navigation/pages/nav/on-click.js
@@ -15,24 +15,23 @@ export default class OnClick extends Component {
     const { count } = this.props
     return (
       <div id="on-click-page">
-        <Link href={`/nav/on-click?count=${count + 1}`} replace>
-          <a
-            id="on-click-link"
-            onClick={() => this.setState({ stateCounter: stateCounter + 1 })}
-          >
-            Self Reload
-          </a>
+        <Link
+          href={`/nav/on-click?count=${count + 1}`}
+          replace
+          id="on-click-link"
+          onClick={() => this.setState({ stateCounter: stateCounter + 1 })}
+        >
+          Self Reload
         </Link>
-        <Link href="/nav/on-click">
-          <a
-            id="on-click-link-prevent-default"
-            onClick={(e) => {
-              e.preventDefault()
-              this.setState({ stateCounter: stateCounter + 1 })
-            }}
-          >
-            Self Reload
-          </a>
+        <Link
+          href="/nav/on-click"
+          id="on-click-link-prevent-default"
+          onClick={(e) => {
+            e.preventDefault()
+            this.setState({ stateCounter: stateCounter + 1 })
+          }}
+        >
+          Self Reload
         </Link>
         <p id="query-count">QUERY COUNT: {count}</p>
         <p id="state-count">STATE COUNT: {stateCounter}</p>
diff --git a/test/integration/client-navigation/pages/nav/pass-href-prop.js b/test/integration/client-navigation/pages/nav/pass-href-prop.js
index ce9acc1ef6df3c..47d6fdea5129f8 100644
--- a/test/integration/client-navigation/pages/nav/pass-href-prop.js
+++ b/test/integration/client-navigation/pages/nav/pass-href-prop.js
@@ -14,11 +14,11 @@ const FakeA = UnexpectedNestedA()
 
 export default () => (
   <div className="nav-pass-href-prop">
-    <Link href="/nav" passHref>
+    <Link href="/nav" passHref legacyBehavior>
       <FakeA id="with-href">Will redirect as an `a` tag</FakeA>
     </Link>
 
-    <Link href="/nav">
+    <Link href="/nav" legacyBehavior>
       <FakeA id="without-href">Will not redirect as an `a` tag</FakeA>
     </Link>
 
diff --git a/test/integration/client-navigation/pages/nav/query-only.js b/test/integration/client-navigation/pages/nav/query-only.js
index af030dbea23e31..d0959b6568e5b2 100644
--- a/test/integration/client-navigation/pages/nav/query-only.js
+++ b/test/integration/client-navigation/pages/nav/query-only.js
@@ -10,8 +10,8 @@ export default function Page({ prop }) {
   return (
     <>
       <div id="prop">{prop}</div>
-      <Link href="?prop=foo">
-        <a id="link">Click me</a>
+      <Link href="?prop=foo" id="link">
+        Click me
       </Link>
       <button id="router-push" onClick={() => router.push('?prop=bar')}>
         Push me
diff --git a/test/integration/client-navigation/pages/nav/querystring.js b/test/integration/client-navigation/pages/nav/querystring.js
index aeb5b7191cd2d3..96b7e14d514ffd 100644
--- a/test/integration/client-navigation/pages/nav/querystring.js
+++ b/test/integration/client-navigation/pages/nav/querystring.js
@@ -9,11 +9,14 @@ export default class AsyncProps extends React.Component {
   render() {
     return (
       <div className="nav-querystring">
-        <Link href={`/nav/querystring?id=${parseInt(this.props.id) + 1}`}>
-          <a id="next-id-link">Click here</a>
+        <Link
+          href={`/nav/querystring?id=${parseInt(this.props.id) + 1}`}
+          id="next-id-link"
+        >
+          Click here
         </Link>
-        <Link href="/nav/querystring">
-          <a id="main-page">Click here</a>
+        <Link href="/nav/querystring" id="main-page">
+          Click here
         </Link>
         <p className={`nav-id-${this.props.id}`}>{this.props.id}</p>
       </div>
diff --git a/test/integration/client-navigation/pages/nav/relative-1.js b/test/integration/client-navigation/pages/nav/relative-1.js
index 4229cafc30afd5..270b8b77e62d6a 100644
--- a/test/integration/client-navigation/pages/nav/relative-1.js
+++ b/test/integration/client-navigation/pages/nav/relative-1.js
@@ -3,10 +3,7 @@ import Link from 'next/link'
 export default function Relative1() {
   return (
     <div id="relative-1">
-      On relative 1
-      <Link href="./relative-2">
-        <a>To relative 2</a>
-      </Link>
+      On relative 1<Link href="./relative-2">To relative 2</Link>
     </div>
   )
 }
diff --git a/test/integration/client-navigation/pages/nav/self-reload.js b/test/integration/client-navigation/pages/nav/self-reload.js
index 29d1f679861e74..a3c32c5b777653 100644
--- a/test/integration/client-navigation/pages/nav/self-reload.js
+++ b/test/integration/client-navigation/pages/nav/self-reload.js
@@ -14,8 +14,8 @@ export default class SelfReload extends Component {
   render() {
     return (
       <div id="self-reload-page">
-        <Link href="/nav/self-reload">
-          <a id="self-reload-link">Self Reload</a>
+        <Link href="/nav/self-reload" id="self-reload-link">
+          Self Reload
         </Link>
         <p>COUNT: {this.props.count}</p>
       </div>
diff --git a/test/integration/client-navigation/pages/nav/shallow-routing.js b/test/integration/client-navigation/pages/nav/shallow-routing.js
index 0d833af89f256c..86c5b57693a246 100644
--- a/test/integration/client-navigation/pages/nav/shallow-routing.js
+++ b/test/integration/client-navigation/pages/nav/shallow-routing.js
@@ -42,10 +42,8 @@ export default withRouter(
     render() {
       return (
         <div className="shallow-routing">
-          <Link href="/nav">
-            <a id="home-link" style={linkStyle}>
-              Home
-            </a>
+          <Link href="/nav" id="home-link" style={linkStyle}>
+            Home
           </Link>
           <div id="counter" style={{ marginBottom: 4000 }}>
             Counter: {this.getCurrentCounter()}
diff --git a/test/integration/client-shallow-routing/pages/[slug].js b/test/integration/client-shallow-routing/pages/[slug].js
index d3712fabfb4c54..41f4b0a1320eda 100644
--- a/test/integration/client-shallow-routing/pages/[slug].js
+++ b/test/integration/client-shallow-routing/pages/[slug].js
@@ -4,16 +4,16 @@ export default function Page(props) {
   return (
     <>
       <p id="props">{JSON.stringify(props)}</p>
-      <Link href="/first?a=b" shallow>
-        <a id="add-query-shallow">add query shallow</a>
+      <Link href="/first?a=b" shallow id="add-query-shallow">
+        add query shallow
       </Link>
       <br />
-      <Link href="/first" shallow>
-        <a id="remove-query-shallow">remove query shallow</a>
+      <Link href="/first" shallow id="remove-query-shallow">
+        remove query shallow
       </Link>
       <br />
-      <Link href="/another">
-        <a id="to-another">to /another non-shallow</a>
+      <Link href="/another" id="to-another">
+        to /another non-shallow
       </Link>
     </>
   )
diff --git a/test/integration/config-experimental-warning/test/index.test.js b/test/integration/config-experimental-warning/test/index.test.js
index 1f63e260e5c4a1..4f9b9c27b8c1e0 100644
--- a/test/integration/config-experimental-warning/test/index.test.js
+++ b/test/integration/config-experimental-warning/test/index.test.js
@@ -44,13 +44,13 @@ describe('Config Experimental Warning', () => {
       module.exports = {
         target: 'server',
         experimental: {
-          newNextLinkBehavior: true
+          workerThreads: true
         }
       }
     `)
     const { stderr } = await nextBuild(appDir, [], { stderr: true })
     expect(stderr).toMatch(
-      'You have enabled experimental feature (newNextLinkBehavior) in next.config.js.'
+      'You have enabled experimental feature (workerThreads) in next.config.js.'
     )
   })
 
@@ -59,13 +59,13 @@ describe('Config Experimental Warning', () => {
       module.exports = (phase) => ({
         target: 'server',
         experimental: {
-          newNextLinkBehavior: true
+          workerThreads: true
         }
       })
     `)
     const { stderr } = await nextBuild(appDir, [], { stderr: true })
     expect(stderr).toMatch(
-      'You have enabled experimental feature (newNextLinkBehavior) in next.config.js.'
+      'You have enabled experimental feature (workerThreads) in next.config.js.'
     )
   })
 
@@ -74,13 +74,13 @@ describe('Config Experimental Warning', () => {
       module.exports = (phase) => ({
         target: 'server',
         experimental: {
-          newNextLinkBehavior: false
+          workerThreads: false
         }
       })
     `)
     const { stderr } = await nextBuild(appDir, [], { stderr: true })
     expect(stderr).not.toMatch(
-      'You have enabled experimental feature (newNextLinkBehavior) in next.config.js.'
+      'You have enabled experimental feature (workerThreads) in next.config.js.'
     )
   })
 
@@ -88,14 +88,14 @@ describe('Config Experimental Warning', () => {
     configFile.write(`
       module.exports = {
         experimental: {
-          newNextLinkBehavior: true,
+          workerThreads: true,
           legacyBrowsers: false,
         }
       }
     `)
     const { stderr } = await nextBuild(appDir, [], { stderr: true })
     expect(stderr).toMatch(
-      'You have enabled experimental features (newNextLinkBehavior, legacyBrowsers) in next.config.js.'
+      'You have enabled experimental features (workerThreads, legacyBrowsers) in next.config.js.'
     )
   })
 
@@ -103,14 +103,14 @@ describe('Config Experimental Warning', () => {
     configFileMjs.write(`
       const config = {
         experimental: {
-          newNextLinkBehavior: true,
+          workerThreads: true,
         }
       }
       export default config
     `)
     const { stderr } = await nextBuild(appDir, [], { stderr: true })
     expect(stderr).toMatch(
-      'You have enabled experimental feature (newNextLinkBehavior) in next.config.mjs.'
+      'You have enabled experimental feature (workerThreads) in next.config.mjs.'
     )
   })
 })
diff --git a/test/integration/css-fixtures/composes-ordering/pages/index.js b/test/integration/css-fixtures/composes-ordering/pages/index.js
index dd97041a332c8d..d4144e50696c1c 100644
--- a/test/integration/css-fixtures/composes-ordering/pages/index.js
+++ b/test/integration/css-fixtures/composes-ordering/pages/index.js
@@ -4,8 +4,8 @@ import css from './index.module.css'
 export default function Home() {
   return (
     <main>
-      <Link href="/other" prefetch={false}>
-        <a id="link-other">other</a>
+      <Link href="/other" prefetch={false} id="link-other">
+        other
       </Link>
       <br />
       <h1 id="black-title" className={css.header}>
diff --git a/test/integration/css-fixtures/composes-ordering/pages/other.js b/test/integration/css-fixtures/composes-ordering/pages/other.js
index 2b3b76459e5375..5e5f7d59db141f 100644
--- a/test/integration/css-fixtures/composes-ordering/pages/other.js
+++ b/test/integration/css-fixtures/composes-ordering/pages/other.js
@@ -4,8 +4,8 @@ import css from './other.module.css'
 export default function Other() {
   return (
     <main>
-      <Link href="/">
-        <a id="link-index">index page</a>
+      <Link href="/" id="link-index">
+        index page
       </Link>
       <br />
       <h1 id="red-title" className={css.root}>
diff --git a/test/integration/css-fixtures/csp-style-src-nonce/pages/index.js b/test/integration/css-fixtures/csp-style-src-nonce/pages/index.js
index 9f85ab76f282ea..31cd0f6e7bcddc 100644
--- a/test/integration/css-fixtures/csp-style-src-nonce/pages/index.js
+++ b/test/integration/css-fixtures/csp-style-src-nonce/pages/index.js
@@ -4,8 +4,8 @@ import css from './index.module.css'
 export default function Home() {
   return (
     <main>
-      <Link href="/other" prefetch={false}>
-        <a id="link-other">other page</a>
+      <Link href="/other" prefetch={false} id="link-other">
+        other page
       </Link>
       <h1 id="green-title" className={css.green}>
         Green
diff --git a/test/integration/css-fixtures/csp-style-src-nonce/pages/other.js b/test/integration/css-fixtures/csp-style-src-nonce/pages/other.js
index ea6435ecb25cd1..0fb6dd1a00f319 100644
--- a/test/integration/css-fixtures/csp-style-src-nonce/pages/other.js
+++ b/test/integration/css-fixtures/csp-style-src-nonce/pages/other.js
@@ -4,8 +4,8 @@ import css from './other.module.css'
 export default function Other() {
   return (
     <main>
-      <Link href="/">
-        <a id="link-index">index page</a>
+      <Link href="/" id="link-index">
+        index page
       </Link>
       <br />
       <h1 id="blue-title" className={css.blue}>
diff --git a/test/integration/css-fixtures/hydrate-without-deps/pages/index.js b/test/integration/css-fixtures/hydrate-without-deps/pages/index.js
index 17e7810c915f5b..3403b9989ceeb7 100644
--- a/test/integration/css-fixtures/hydrate-without-deps/pages/index.js
+++ b/test/integration/css-fixtures/hydrate-without-deps/pages/index.js
@@ -13,8 +13,8 @@ export default function Home() {
         Black
       </h1>
       <p>{state}</p>
-      <Link href="/client">
-        <a id="link-client">To /client</a>
+      <Link href="/client" id="link-client">
+        To /client
       </Link>
     </main>
   )
diff --git a/test/integration/css-fixtures/multi-module/pages/blue.js b/test/integration/css-fixtures/multi-module/pages/blue.js
index 49dff85067fa32..be7424c133224e 100644
--- a/test/integration/css-fixtures/multi-module/pages/blue.js
+++ b/test/integration/css-fixtures/multi-module/pages/blue.js
@@ -8,12 +8,12 @@ export default function Blue() {
         This text should be blue.
       </div>
       <br />
-      <Link href="/red" prefetch>
-        <a id="link-red">Red</a>
+      <Link href="/red" prefetch id="link-red">
+        Red
       </Link>
       <br />
-      <Link href="/none" prefetch={false}>
-        <a id="link-none">None</a>
+      <Link href="/none" prefetch={false} id="link-none">
+        None
       </Link>
     </>
   )
diff --git a/test/integration/css-fixtures/multi-module/pages/none.js b/test/integration/css-fixtures/multi-module/pages/none.js
index f26c2d80b3ae0a..6a455d95858cd0 100644
--- a/test/integration/css-fixtures/multi-module/pages/none.js
+++ b/test/integration/css-fixtures/multi-module/pages/none.js
@@ -7,12 +7,12 @@ export default function None() {
         This text should be black.
       </div>
       <br />
-      <Link href="/red" prefetch={false}>
-        <a id="link-red">Red</a>
+      <Link href="/red" prefetch={false} id="link-red">
+        Red
       </Link>
       <br />
-      <Link href="/blue" prefetch={false}>
-        <a id="link-blue">Blue</a>
+      <Link href="/blue" prefetch={false} id="link-blue">
+        Blue
       </Link>
     </>
   )
diff --git a/test/integration/css-fixtures/multi-module/pages/red.js b/test/integration/css-fixtures/multi-module/pages/red.js
index d67276dda2d765..5709139de9c4c7 100644
--- a/test/integration/css-fixtures/multi-module/pages/red.js
+++ b/test/integration/css-fixtures/multi-module/pages/red.js
@@ -8,12 +8,12 @@ export default function Red() {
         This text should be red.
       </div>
       <br />
-      <Link href="/blue" prefetch={false}>
-        <a id="link-blue">Blue</a>
+      <Link href="/blue" prefetch={false} id="link-blue">
+        Blue
       </Link>
       <br />
-      <Link href="/none" prefetch={false}>
-        <a id="link-none">None</a>
+      <Link href="/none" prefetch={false} id="link-none">
+        None
       </Link>
     </>
   )
diff --git a/test/integration/css-fixtures/multi-page/pages/page1.js b/test/integration/css-fixtures/multi-page/pages/page1.js
index 94b9d0f24ca37d..bbb3756ceaed3c 100644
--- a/test/integration/css-fixtures/multi-page/pages/page1.js
+++ b/test/integration/css-fixtures/multi-page/pages/page1.js
@@ -6,9 +6,7 @@ export default function Page1() {
       <br />
       <input key={'' + Math.random()} id="text-input" type="text" />
       <br />
-      <Link href="/page2">
-        <a>Switch page</a>
-      </Link>
+      <Link href="/page2">Switch page</Link>
     </>
   )
 }
diff --git a/test/integration/css-fixtures/multi-page/pages/page2.js b/test/integration/css-fixtures/multi-page/pages/page2.js
index e8e49a87514dc7..10f2c5792255bf 100644
--- a/test/integration/css-fixtures/multi-page/pages/page2.js
+++ b/test/integration/css-fixtures/multi-page/pages/page2.js
@@ -6,9 +6,7 @@ export default function Page2() {
       <br />
       <input key={'' + Math.random()} id="text-input" type="text" />
       <br />
-      <Link href="/page1">
-        <a>Switch page</a>
-      </Link>
+      <Link href="/page1">Switch page</Link>
     </>
   )
 }
diff --git a/test/integration/css-fixtures/next-issue-12343/pages/another-page.js b/test/integration/css-fixtures/next-issue-12343/pages/another-page.js
index f373ba5a0af394..b49bbfaae14c80 100644
--- a/test/integration/css-fixtures/next-issue-12343/pages/another-page.js
+++ b/test/integration/css-fixtures/next-issue-12343/pages/another-page.js
@@ -5,7 +5,7 @@ function AnotherPage() {
   return (
     <div>
       <h1>Another page</h1>
-      <Link href="/" passHref>
+      <Link href="/" passHref legacyBehavior>
         <Button id="link-index">Another Button instance</Button>
       </Link>
     </div>
diff --git a/test/integration/css-fixtures/next-issue-12343/pages/index.js b/test/integration/css-fixtures/next-issue-12343/pages/index.js
index 500773525a1af6..d662a09fec7ff4 100644
--- a/test/integration/css-fixtures/next-issue-12343/pages/index.js
+++ b/test/integration/css-fixtures/next-issue-12343/pages/index.js
@@ -6,7 +6,7 @@ function HomePage() {
   return (
     <div>
       <h1>Home page</h1>
-      <Link href="/another-page" passHref>
+      <Link href="/another-page" passHref legacyBehavior>
         <Button id="link-other" className={styles.button}>
           Another page
         </Button>
diff --git a/test/integration/css-fixtures/transition-cleanup/pages/index.js b/test/integration/css-fixtures/transition-cleanup/pages/index.js
index 2c1b84ba310809..669876760698cc 100644
--- a/test/integration/css-fixtures/transition-cleanup/pages/index.js
+++ b/test/integration/css-fixtures/transition-cleanup/pages/index.js
@@ -4,8 +4,8 @@ import css from './index.module.css'
 export default function Home() {
   return (
     <main>
-      <Link href="/other">
-        <a id="link-other">other</a>
+      <Link href="/other" id="link-other">
+        other
       </Link>
       <br />
       <h1 id="black-title" className={css.header}>
diff --git a/test/integration/css-fixtures/transition-react/pages/index.js b/test/integration/css-fixtures/transition-react/pages/index.js
index 9bcdbe8c24f617..65fe8dae95fb36 100644
--- a/test/integration/css-fixtures/transition-react/pages/index.js
+++ b/test/integration/css-fixtures/transition-react/pages/index.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 export default function Home() {
   return (
     <main>
-      <Link href="/other" prefetch={false}>
-        <a id="link-other">other</a>
+      <Link href="/other" prefetch={false} id="link-other">
+        other
       </Link>
     </main>
   )
diff --git a/test/integration/css-fixtures/transition-react/pages/other.js b/test/integration/css-fixtures/transition-react/pages/other.js
index a9a6748f8d2b20..dbee7e291bf3c4 100644
--- a/test/integration/css-fixtures/transition-react/pages/other.js
+++ b/test/integration/css-fixtures/transition-react/pages/other.js
@@ -21,8 +21,8 @@ export default class Other extends React.Component {
   render() {
     return (
       <main>
-        <Link href="/" prefetch={false}>
-          <a id="link-index">index page</a>
+        <Link href="/" prefetch={false} id="link-index">
+          index page
         </Link>
         <br />
         <h1 id="red-title" className={css.root} ref={this.ref}>
diff --git a/test/integration/css-fixtures/transition-reload/pages/index.js b/test/integration/css-fixtures/transition-reload/pages/index.js
index dd97041a332c8d..d4144e50696c1c 100644
--- a/test/integration/css-fixtures/transition-reload/pages/index.js
+++ b/test/integration/css-fixtures/transition-reload/pages/index.js
@@ -4,8 +4,8 @@ import css from './index.module.css'
 export default function Home() {
   return (
     <main>
-      <Link href="/other" prefetch={false}>
-        <a id="link-other">other</a>
+      <Link href="/other" prefetch={false} id="link-other">
+        other
       </Link>
       <br />
       <h1 id="black-title" className={css.header}>
diff --git a/test/integration/css-fixtures/transition-reload/pages/other.js b/test/integration/css-fixtures/transition-reload/pages/other.js
index ec594ee73f32fa..191f5f5661dcfc 100644
--- a/test/integration/css-fixtures/transition-reload/pages/other.js
+++ b/test/integration/css-fixtures/transition-reload/pages/other.js
@@ -4,8 +4,8 @@ import css from './other.module.css'
 export default function Other() {
   return (
     <main>
-      <Link href="/" prefetch={false}>
-        <a id="link-index">index page</a>
+      <Link href="/" prefetch={false} id="link-index">
+        index page
       </Link>
       <br />
       <h1 id="red-title" className={css.root}>
diff --git a/test/integration/css-fixtures/with-tailwindcss-and-purgecss/pages/index.js b/test/integration/css-fixtures/with-tailwindcss-and-purgecss/pages/index.js
index 488d8b23c4e934..0c1d2b7cae38a2 100644
--- a/test/integration/css-fixtures/with-tailwindcss-and-purgecss/pages/index.js
+++ b/test/integration/css-fixtures/with-tailwindcss-and-purgecss/pages/index.js
@@ -10,8 +10,8 @@ function Nav() {
     <nav>
       <ul className="flex justify-between items-center p-8">
         <li>
-          <Link href="/">
-            <a className="text-blue-500 no-underline">Home</a>
+          <Link href="/" className="text-blue-500 no-underline">
+            Home
           </Link>
         </li>
         <ul className="flex justify-between items-center">
diff --git a/test/integration/custom-error-page-exception/pages/index.js b/test/integration/custom-error-page-exception/pages/index.js
index 1314e09108650c..c9c9f91ab244d8 100644
--- a/test/integration/custom-error-page-exception/pages/index.js
+++ b/test/integration/custom-error-page-exception/pages/index.js
@@ -4,8 +4,8 @@ import Link from 'next/link'
 
 function page() {
   return (
-    <Link href="/">
-      <a id="nav">Client side nav</a>
+    <Link href="/" id="nav">
+      Client side nav
     </Link>
   )
 }
diff --git a/test/integration/custom-routes-i18n/pages/links.js b/test/integration/custom-routes-i18n/pages/links.js
index 97dd8933f653a4..68af4912265fe3 100644
--- a/test/integration/custom-routes-i18n/pages/links.js
+++ b/test/integration/custom-routes-i18n/pages/links.js
@@ -4,23 +4,23 @@ export default function Links() {
   return (
     <>
       <p id="links">Links</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
 
-      <Link href="/about">
-        <a id="to-about">to /about</a>
+      <Link href="/about" id="to-about">
+        to /about
       </Link>
       <br />
 
-      <Link href="/catch-all/hello">
-        <a id="to-catch-all">to /catch-all/hello</a>
+      <Link href="/catch-all/hello" id="to-catch-all">
+        to /catch-all/hello
       </Link>
       <br />
 
-      <Link href="/links">
-        <a id="to-links">to /links</a>
+      <Link href="/links" id="to-links">
+        to /links
       </Link>
     </>
   )
diff --git a/test/integration/custom-routes/pages/hello-again.js b/test/integration/custom-routes/pages/hello-again.js
index 985832b525b471..423fa65b0aac8d 100644
--- a/test/integration/custom-routes/pages/hello-again.js
+++ b/test/integration/custom-routes/pages/hello-again.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 export default () => (
   <>
     <h3 id="hello-again">Hello again</h3>
-    <Link href="/nav">
-      <a id="to-nav">to nav</a>
+    <Link href="/nav" id="to-nav">
+      to nav
     </Link>
   </>
 )
diff --git a/test/integration/custom-routes/pages/hello.js b/test/integration/custom-routes/pages/hello.js
index daa1534892fb9c..c9f103d41e0cac 100644
--- a/test/integration/custom-routes/pages/hello.js
+++ b/test/integration/custom-routes/pages/hello.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 const Page = () => (
   <>
     <h3 id="hello">Hello</h3>
-    <Link href="/nav">
-      <a id="to-nav">to nav</a>
+    <Link href="/nav" id="to-nav">
+      to nav
     </Link>
   </>
 )
diff --git a/test/integration/custom-routes/pages/nav.js b/test/integration/custom-routes/pages/nav.js
index e2acbb4d22fde3..6d05087154507d 100644
--- a/test/integration/custom-routes/pages/nav.js
+++ b/test/integration/custom-routes/pages/nav.js
@@ -3,12 +3,12 @@ import Link from 'next/link'
 const Page = () => (
   <>
     <h3 id="nav">Nav</h3>
-    <Link href="/hello" as="/first">
-      <a id="to-hello">to hello</a>
+    <Link href="/hello" as="/first" id="to-hello">
+      to hello
     </Link>
     <br />
-    <Link href="/hello-again" as="/second">
-      <a id="to-hello-again">to hello-again</a>
+    <Link href="/hello-again" as="/second" id="to-hello-again">
+      to hello-again
     </Link>
     <br />
     <Link
@@ -20,36 +20,37 @@ const Page = () => (
         },
       }}
       as="/params/1?another=value"
+      id="to-params-manual"
     >
-      <a id="to-params-manual">to params (manual)</a>
+      to params (manual)
     </Link>
     <br />
-    <Link href="/params/1?another=value">
-      <a id="to-params">to params</a>
+    <Link href="/params/1?another=value" id="to-params">
+      to params
     </Link>
     <br />
-    <Link href="/rewriting-to-auto-export">
-      <a id="to-rewritten-dynamic">to rewritten dynamic</a>
+    <Link href="/rewriting-to-auto-export" id="to-rewritten-dynamic">
+      to rewritten dynamic
     </Link>
     <br />
-    <Link href="/hello?overrideMe=1">
-      <a id="to-overridden">to /hello?overrideMe=1</a>
+    <Link href="/hello?overrideMe=1" id="to-overridden">
+      to /hello?overrideMe=1
     </Link>
     <br />
-    <Link href="/old-blog/about">
-      <a id="to-old-blog">to /old-blog/post-1</a>
+    <Link href="/old-blog/about" id="to-old-blog">
+      to /old-blog/post-1
     </Link>
     <br />
-    <Link href="/overridden">
-      <a id="to-before-files-overridden">to /overridden</a>
+    <Link href="/overridden" id="to-before-files-overridden">
+      to /overridden
     </Link>
     <br />
-    <Link href="/nfl">
-      <a id="to-before-files-dynamic">to /nfl</a>
+    <Link href="/nfl" id="to-before-files-dynamic">
+      to /nfl
     </Link>
     <br />
-    <Link href="/nfl/test">
-      <a id="to-before-files-dynamic-again">to /nfl/test</a>
+    <Link href="/nfl/test" id="to-before-files-dynamic-again">
+      to /nfl/test
     </Link>
     <br />
   </>
diff --git a/test/integration/custom-server/pages/index.js b/test/integration/custom-server/pages/index.js
index ec49a16286d109..62a0cb73e4279e 100644
--- a/test/integration/custom-server/pages/index.js
+++ b/test/integration/custom-server/pages/index.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 export default function Index() {
   return (
     <div>
-      <Link href="/asset">
-        <a id="go-asset">Asset</a>
+      <Link href="/asset" id="go-asset">
+        Asset
       </Link>
     </div>
   )
diff --git a/test/integration/dedupes-scripts/components/hello.js b/test/integration/dedupes-scripts/components/hello.js
index 35e40485bc468a..65d41eaf9e3a5e 100644
--- a/test/integration/dedupes-scripts/components/hello.js
+++ b/test/integration/dedupes-scripts/components/hello.js
@@ -1,7 +1,3 @@
 import Link from 'next/link'
 
-export default () => (
-  <Link href="/">
-    <a>Hello world</a>
-  </Link>
-)
+export default () => <Link href="/">Hello world</Link>
diff --git a/test/integration/dynamic-routing/pages/[name]/index.js b/test/integration/dynamic-routing/pages/[name]/index.js
index 8f801b21d2bcc0..e0cc6d792e5013 100644
--- a/test/integration/dynamic-routing/pages/[name]/index.js
+++ b/test/integration/dynamic-routing/pages/[name]/index.js
@@ -6,48 +6,55 @@ const Page = () => {
   const { query } = router
   return (
     <>
-      <Link href="#only-hash">
-        <a id="dynamic-route-only-hash">Dynamic route only hash</a>
+      <Link href="#only-hash" id="dynamic-route-only-hash">
+        Dynamic route only hash
       </Link>
       <br />
-      <Link href={{ hash: 'only-hash-obj' }}>
-        <a id="dynamic-route-only-hash-obj">Dynamic route only hash object</a>
+      <Link href={{ hash: 'only-hash-obj' }} id="dynamic-route-only-hash-obj">
+        Dynamic route only hash object
       </Link>
       <br />
-      <Link href="?name=post-2">
-        <a id="dynamic-route-only-query">Dynamic route only query</a>
+      <Link href="?name=post-2" id="dynamic-route-only-query">
+        Dynamic route only query
       </Link>
       <br />
-      <Link href="?name=post-3&another=value">
-        <a id="dynamic-route-only-query-extra">
-          Dynamic route only query extra
-        </a>
+      <Link
+        href="?name=post-3&another=value"
+        id="dynamic-route-only-query-extra"
+      >
+        Dynamic route only query extra
       </Link>
       <br />
-      <Link href={{ query: { name: 'post-4' } }}>
-        <a id="dynamic-route-only-query-obj">Dynamic route only query object</a>
+      <Link
+        href={{ query: { name: 'post-4' } }}
+        id="dynamic-route-only-query-obj"
+      >
+        Dynamic route only query object
       </Link>
       <br />
-      <Link href={{ query: { name: 'post-5', another: 'value' } }}>
-        <a id="dynamic-route-only-query-obj-extra">
-          Dynamic route only query object extra
-        </a>
+      <Link
+        href={{ query: { name: 'post-5', another: 'value' } }}
+        id="dynamic-route-only-query-obj-extra"
+      >
+        Dynamic route only query object extra
       </Link>
       <br />
-      <Link href="?name=post-2#hash-too">
-        <a id="dynamic-route-query-hash">Dynamic route query and hash</a>
+      <Link href="?name=post-2#hash-too" id="dynamic-route-query-hash">
+        Dynamic route query and hash
       </Link>
       <br />
-      <Link href="?name=post-3&another=value#hash-again">
-        <a id="dynamic-route-query-extra-hash">
-          Dynamic route query extra and hash
-        </a>
+      <Link
+        href="?name=post-3&another=value#hash-again"
+        id="dynamic-route-query-extra-hash"
+      >
+        Dynamic route query extra and hash
       </Link>
       <br />
-      <Link href={{ query: { name: 'post-4' }, hash: 'hash-too' }}>
-        <a id="dynamic-route-query-hash-obj">
-          Dynamic route query and hash object
-        </a>
+      <Link
+        href={{ query: { name: 'post-4' }, hash: 'hash-too' }}
+        id="dynamic-route-query-hash-obj"
+      >
+        Dynamic route query and hash object
       </Link>
       <br />
       <Link
@@ -55,10 +62,9 @@ const Page = () => {
           query: { name: 'post-5', another: 'value' },
           hash: 'hash-again',
         }}
+        id="dynamic-route-query-obj-extra-hash"
       >
-        <a id="dynamic-route-query-obj-extra-hash">
-          Dynamic route query and hash object extra
-        </a>
+        Dynamic route query and hash object extra
       </Link>
       <br />
       <p id="asdf">This is {query.name}</p>
diff --git a/test/integration/dynamic-routing/pages/index.js b/test/integration/dynamic-routing/pages/index.js
index c021f5b367ea5e..00ac7daeb7b548 100644
--- a/test/integration/dynamic-routing/pages/index.js
+++ b/test/integration/dynamic-routing/pages/index.js
@@ -14,20 +14,24 @@ const Page = () => {
   return (
     <div>
       <h3>My blog</h3>
-      <Link href="/[name]" as="/post-1">
-        <a id="view-post-1">View post 1</a>
+      <Link href="/[name]" as="/post-1" id="view-post-1">
+        View post 1
       </Link>
       <br />
-      <Link href="/[name]" as="/post-1#my-hash">
-        <a id="view-post-1-hash-1">View post 1 (hash)</a>
+      <Link href="/[name]" as="/post-1#my-hash" id="view-post-1-hash-1">
+        View post 1 (hash)
       </Link>
       <br />
-      <Link href="/post-1#my-hash">
-        <a id="view-post-1-hash-1-href-only">View post 1 (hash only href)</a>
+      <Link href="/post-1#my-hash" id="view-post-1-hash-1-href-only">
+        View post 1 (hash only href)
       </Link>
       <br />
-      <Link href="/post-1?hidden=value" as="/post-1">
-        <a id="view-post-1-hidden-query">View post 1 (href query)</a>
+      <Link
+        href="/post-1?hidden=value"
+        as="/post-1"
+        id="view-post-1-hidden-query"
+      >
+        View post 1 (href query)
       </Link>
       <br />
       <Link
@@ -36,14 +40,13 @@ const Page = () => {
           pathname: '/[name]',
           query: { name: 'post-1' },
         }}
+        id="view-post-1-hash-1-interpolated"
       >
-        <a id="view-post-1-hash-1-interpolated">
-          View post 1 (hash interpolated)
-        </a>
+        View post 1 (hash interpolated)
       </Link>
       <br />
-      <Link href="/post-1">
-        <a id="view-post-1-no-as">View post 1 (no as)</a>
+      <Link href="/post-1" id="view-post-1-no-as">
+        View post 1 (no as)
       </Link>
       <br />
       <Link
@@ -51,8 +54,9 @@ const Page = () => {
           pathname: '/[name]',
           query: { name: 'post-1' },
         }}
+        id="view-post-1-interpolated"
       >
-        <a id="view-post-1-interpolated">View post 1 (interpolated)</a>
+        View post 1 (interpolated)
       </Link>
       <br />
       <Link
@@ -60,10 +64,9 @@ const Page = () => {
           pathname: '/[name]',
           query: { another: 'value' },
         }}
+        id="view-post-1-interpolated-incorrectly"
       >
-        <a id="view-post-1-interpolated-incorrectly">
-          View post 1 (interpolated incorrectly)
-        </a>
+        View post 1 (interpolated incorrectly)
       </Link>
       <br />
       <Link
@@ -71,22 +74,29 @@ const Page = () => {
           pathname: '/[name]',
           query: { name: 'post-1', another: 'value' },
         }}
+        id="view-post-1-interpolated-more-query"
       >
-        <a id="view-post-1-interpolated-more-query">
-          View post 1 (interpolated additional query)
-        </a>
+        View post 1 (interpolated additional query)
       </Link>
       <br />
-      <Link href="/[name]/comments" as="/post-1/comments">
-        <a id="view-post-1-comments">View post 1 comments</a>
+      <Link
+        href="/[name]/comments"
+        as="/post-1/comments"
+        id="view-post-1-comments"
+      >
+        View post 1 comments
       </Link>
       <br />
-      <Link href="/[name]/[comment]" as="/post-1/comment-1">
-        <a id="view-post-1-comment-1">View comment 1 on post 1</a>
+      <Link
+        href="/[name]/[comment]"
+        as="/post-1/comment-1"
+        id="view-post-1-comment-1"
+      >
+        View comment 1 on post 1
       </Link>
       <br />
-      <Link href="/post-1/comment-1">
-        <a id="view-post-1-comment-1-no-as">View comment 1 on post 1 (no as)</a>
+      <Link href="/post-1/comment-1" id="view-post-1-comment-1-no-as">
+        View comment 1 on post 1 (no as)
       </Link>
       <br />
       <Link
@@ -94,49 +104,77 @@ const Page = () => {
           pathname: '/[name]/[comment]',
           query: { name: 'post-1', comment: 'comment-1' },
         }}
+        id="view-post-1-comment-1-interpolated"
       >
-        <a id="view-post-1-comment-1-interpolated">
-          View comment 1 on post 1 (interpolated)
-        </a>
+        View comment 1 on post 1 (interpolated)
       </Link>
       <br />
-      <Link href="/added-later/first">
-        <a id="added-later-link">/added-later/first</a>
+      <Link href="/added-later/first" id="added-later-link">
+        /added-later/first
       </Link>
       <br />
-      <Link href="/blog/[post]/comment/[id]" as="/blog/321/comment/123">
-        <a id="view-nested-dynamic-cmnt">View comment 123 on blog post 321</a>
+      <Link
+        href="/blog/[post]/comment/[id]"
+        as="/blog/321/comment/123"
+        id="view-nested-dynamic-cmnt"
+      >
+        View comment 123 on blog post 321
       </Link>
       <br />
-      <Link href="/[name]?fromHome=true" as="/post-1?fromHome=true">
-        <a id="view-post-1-with-query">View post 1 with query</a>
+      <Link
+        href="/[name]?fromHome=true"
+        as="/post-1?fromHome=true"
+        id="view-post-1-with-query"
+      >
+        View post 1 with query
       </Link>
       <br />
-      <Link href="/on-mount/[post]" as="/on-mount/test-w-hash#item-400">
-        <a id="view-dynamic-with-hash">View test with hash</a>
+      <Link
+        href="/on-mount/[post]"
+        as="/on-mount/test-w-hash#item-400"
+        id="view-dynamic-with-hash"
+      >
+        View test with hash
       </Link>
       <br />
-      <Link href="/p1/p2/all-ssr/[...rest]" as="/p1/p2/all-ssr/hello">
-        <a id="catch-all-single">Catch-all route (single)</a>
+      <Link
+        href="/p1/p2/all-ssr/[...rest]"
+        as="/p1/p2/all-ssr/hello"
+        id="catch-all-single"
+      >
+        Catch-all route (single)
       </Link>
       <br />
-      <Link href="/p1/p2/all-ssr/[...rest]" as="/p1/p2/all-ssr/hello1/hello2">
-        <a id="catch-all-multi">Catch-all route (multi)</a>
+      <Link
+        href="/p1/p2/all-ssr/[...rest]"
+        as="/p1/p2/all-ssr/hello1/hello2"
+        id="catch-all-multi"
+      >
+        Catch-all route (multi)
       </Link>
       <br />
       <Link
         href="/p1/p2/all-ssr/[...rest]"
         as="/p1/p2/all-ssr/hello1%2F/he%2Fllo2"
+        id="catch-all-enc"
       >
-        <a id="catch-all-enc">Catch-all route (encoded)</a>
+        Catch-all route (encoded)
       </Link>
       <br />
-      <Link href="/p1/p2/all-ssr/[...rest]" as="/p1/p2/all-ssr/:42">
-        <a id="catch-all-colonnumber">Catch-all route :42</a>
+      <Link
+        href="/p1/p2/all-ssr/[...rest]"
+        as="/p1/p2/all-ssr/:42"
+        id="catch-all-colonnumber"
+      >
+        Catch-all route :42
       </Link>
       <br />
-      <Link href="/p1/p2/all-ssg/[...rest]" as="/p1/p2/all-ssg/hello">
-        <a id="ssg-catch-all-single">Catch-all route (single)</a>
+      <Link
+        href="/p1/p2/all-ssg/[...rest]"
+        as="/p1/p2/all-ssg/hello"
+        id="ssg-catch-all-single"
+      >
+        Catch-all route (single)
       </Link>
       <br />
       <Link
@@ -144,18 +182,21 @@ const Page = () => {
           pathname: '/p1/p2/all-ssg/[...rest]',
           query: { rest: ['hello'] },
         }}
+        id="ssg-catch-all-single-interpolated"
       >
-        <a id="ssg-catch-all-single-interpolated">
-          Catch-all route (single interpolated)
-        </a>
+        Catch-all route (single interpolated)
       </Link>
       <br />
-      <Link href="/p1/p2/all-ssg/[...rest]" as="/p1/p2/all-ssg/hello1/hello2">
-        <a id="ssg-catch-all-multi">Catch-all route (multi)</a>
+      <Link
+        href="/p1/p2/all-ssg/[...rest]"
+        as="/p1/p2/all-ssg/hello1/hello2"
+        id="ssg-catch-all-multi"
+      >
+        Catch-all route (multi)
       </Link>
       <br />
-      <Link href="/p1/p2/all-ssg/hello1/hello2">
-        <a id="ssg-catch-all-multi-no-as">Catch-all route (multi)</a>
+      <Link href="/p1/p2/all-ssg/hello1/hello2" id="ssg-catch-all-multi-no-as">
+        Catch-all route (multi)
       </Link>
       <br />
       <Link
@@ -163,28 +204,29 @@ const Page = () => {
           pathname: '/p1/p2/all-ssg/[...rest]',
           query: { rest: ['hello1', 'hello2'] },
         }}
+        id="ssg-catch-all-multi-interpolated"
       >
-        <a id="ssg-catch-all-multi-interpolated">
-          Catch-all route (multi interpolated)
-        </a>
+        Catch-all route (multi interpolated)
       </Link>
       <br />
       <Link
         href="/p1/p2/nested-all-ssg/[...rest]"
         as="/p1/p2/nested-all-ssg/hello"
+        id="nested-ssg-catch-all-single"
       >
-        <a id="nested-ssg-catch-all-single">Nested Catch-all route (single)</a>
+        Nested Catch-all route (single)
       </Link>
       <br />
       <Link
         href="/p1/p2/nested-all-ssg/[...rest]"
         as="/p1/p2/nested-all-ssg/hello1/hello2"
+        id="nested-ssg-catch-all-multi"
       >
-        <a id="nested-ssg-catch-all-multi">Nested Catch-all route (multi)</a>
+        Nested Catch-all route (multi)
       </Link>
       <br />
-      <Link href="/d/dynamic-1">
-        <a id="dynamic-route-no-as">Dynamic route no as</a>
+      <Link href="/d/dynamic-1" id="dynamic-route-no-as">
+        Dynamic route no as
       </Link>
       <p id="query">{JSON.stringify(Object.keys(useRouter().query))}</p>
     </div>
diff --git a/test/integration/error-in-error/pages/index.js b/test/integration/error-in-error/pages/index.js
index 598c95376ce38b..1f500396aba348 100644
--- a/test/integration/error-in-error/pages/index.js
+++ b/test/integration/error-in-error/pages/index.js
@@ -4,9 +4,7 @@ function Index() {
   return (
     <>
       <h3>Hi 👋</h3>
-      <Link href="/a-non-existing-page">
-        <a>a link to no-where</a>
-      </Link>
+      <Link href="/a-non-existing-page">a link to no-where</Link>
     </>
   )
 }
diff --git a/test/integration/error-load-fail/pages/index.js b/test/integration/error-load-fail/pages/index.js
index 95c50d4edaeb54..1fef3a6dd054c7 100644
--- a/test/integration/error-load-fail/pages/index.js
+++ b/test/integration/error-load-fail/pages/index.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export default () => (
   <>
-    <Link href="/broken">
-      <a id="to-broken">to oops</a>
+    <Link href="/broken" id="to-broken">
+      to oops
     </Link>
   </>
 )
diff --git a/test/integration/export-serverless/pages/about.js b/test/integration/export-serverless/pages/about.js
index 41c60ddae891fd..54a0ac485413aa 100644
--- a/test/integration/export-serverless/pages/about.js
+++ b/test/integration/export-serverless/pages/about.js
@@ -3,9 +3,7 @@ import Link from 'next/link'
 const About = ({ bar }) => (
   <div id="about-page">
     <div>
-      <Link href="/">
-        <a>Go Back</a>
-      </Link>
+      <Link href="/">Go Back</Link>
     </div>
     <p>{`This is the About page foo${bar || ''}`}</p>
   </div>
diff --git a/test/integration/export-serverless/pages/button-link.js b/test/integration/export-serverless/pages/button-link.js
index 9f3427e665bf50..1f0c5540fe84ce 100644
--- a/test/integration/export-serverless/pages/button-link.js
+++ b/test/integration/export-serverless/pages/button-link.js
@@ -3,7 +3,7 @@ import Link from 'next/link'
 export default () => (
   <div id="button-link-page">
     <div>
-      <Link href="/" passHref>
+      <Link href="/" passHref legacyBehavior>
         <button>Go Back</button>
       </Link>
     </div>
diff --git a/test/integration/export-serverless/pages/counter.js b/test/integration/export-serverless/pages/counter.js
index 5360313b661869..6d3ceccf0ae361 100644
--- a/test/integration/export-serverless/pages/counter.js
+++ b/test/integration/export-serverless/pages/counter.js
@@ -13,8 +13,8 @@ export default class Counter extends React.Component {
     return (
       <div id="counter-page">
         <div>
-          <Link href="/">
-            <a id="go-back">Go Back</a>
+          <Link href="/" id="go-back">
+            Go Back
           </Link>
         </div>
         <p>Counter: {counter}</p>
diff --git a/test/integration/export-serverless/pages/dynamic-imports.js b/test/integration/export-serverless/pages/dynamic-imports.js
index 43ba2866bcf488..ec8f06e656e8a5 100644
--- a/test/integration/export-serverless/pages/dynamic-imports.js
+++ b/test/integration/export-serverless/pages/dynamic-imports.js
@@ -6,9 +6,7 @@ const DynamicComponent = dynamic(() => import('../components/hello'))
 export default () => (
   <div id="dynamic-imports-page">
     <div>
-      <Link href="/">
-        <a>Go Back</a>
-      </Link>
+      <Link href="/">Go Back</Link>
     </div>
     <DynamicComponent />
   </div>
diff --git a/test/integration/export-serverless/pages/dynamic.js b/test/integration/export-serverless/pages/dynamic.js
index 76fbdbc9981be7..3a0d4d426cdc70 100644
--- a/test/integration/export-serverless/pages/dynamic.js
+++ b/test/integration/export-serverless/pages/dynamic.js
@@ -21,9 +21,7 @@ export default class DynamicPage extends React.Component {
     return (
       <div id="dynamic-page">
         <div>
-          <Link href="/">
-            <a>Go Back</a>
-          </Link>
+          <Link href="/">Go Back</Link>
         </div>
         <p>{text}</p>
         <div id="hash">Hash: {hash}</div>
diff --git a/test/integration/export-serverless/pages/index.js b/test/integration/export-serverless/pages/index.js
index a6710903896079..7948b0ea6361d7 100644
--- a/test/integration/export-serverless/pages/index.js
+++ b/test/integration/export-serverless/pages/index.js
@@ -9,37 +9,49 @@ function routeToAbout(e) {
 export default () => (
   <div id="home-page">
     <div>
-      <Link href="/about">
+      <Link href="/about" legacyBehavior>
         <a id="about-via-link">About via Link</a>
       </Link>
       <a href="#" onClick={routeToAbout} id="about-via-router">
         About via Router
       </a>
-      <Link href="/counter">
+      <Link href="/counter" legacyBehavior>
         <a id="counter">Counter</a>
       </Link>
-      <Link href="/dynamic?text=cool+dynamic+text">
+      <Link href="/dynamic?text=cool+dynamic+text" legacyBehavior>
         <a id="get-initial-props">getInitialProps</a>
       </Link>
-      <Link href="/dynamic?text=next+export+is+nice" as="/dynamic/one">
+      <Link
+        href="/dynamic?text=next+export+is+nice"
+        as="/dynamic/one"
+        legacyBehavior
+      >
         <a id="dynamic-1">Dynamic 1</a>
       </Link>
-      <Link href="/dynamic?text=Vercel+is+awesome" as="/dynamic/two">
+      <Link
+        href="/dynamic?text=Vercel+is+awesome"
+        as="/dynamic/two"
+        legacyBehavior
+      >
         <a id="dynamic-2">Dynamic 2</a>
       </Link>
-      <Link href="/dynamic?text=Vercel+is+awesome#cool">
+      <Link href="/dynamic?text=Vercel+is+awesome#cool" legacyBehavior>
         <a id="with-hash">With Hash</a>
       </Link>
-      <Link href="/dynamic?text=this+file+has+an+extension" as="/file-name.md">
+      <Link
+        href="/dynamic?text=this+file+has+an+extension"
+        as="/file-name.md"
+        legacyBehavior
+      >
         <a id="path-with-extension">Path with extension</a>
       </Link>
-      <Link href="/level1">
+      <Link href="/level1" legacyBehavior>
         <a id="level1-home-page">Level1 home page</a>
       </Link>
-      <Link href="/level1/about">
+      <Link href="/level1/about" legacyBehavior>
         <a id="level1-about-page">Level1 about page</a>
       </Link>
-      <Link href="/dynamic-imports">
+      <Link href="/dynamic-imports" legacyBehavior>
         <a id="dynamic-imports-link">Dynamic imports page</a>
       </Link>
     </div>
diff --git a/test/integration/export-serverless/pages/level1/about.js b/test/integration/export-serverless/pages/level1/about.js
index 4455046b86c579..1f68cbd2e68630 100644
--- a/test/integration/export-serverless/pages/level1/about.js
+++ b/test/integration/export-serverless/pages/level1/about.js
@@ -3,9 +3,7 @@ import Link from 'next/link'
 export default () => (
   <div id="level1-about-page">
     <div>
-      <Link href="/">
-        <a>Go Back</a>
-      </Link>
+      <Link href="/">Go Back</Link>
     </div>
     <p>This is the Level1 about page</p>
   </div>
diff --git a/test/integration/export-serverless/pages/level1/index.js b/test/integration/export-serverless/pages/level1/index.js
index a285bcdac8aa4f..82e32702621fd2 100644
--- a/test/integration/export-serverless/pages/level1/index.js
+++ b/test/integration/export-serverless/pages/level1/index.js
@@ -3,9 +3,7 @@ import Link from 'next/link'
 export default () => (
   <div id="level1-home-page">
     <div>
-      <Link href="/">
-        <a>Go Back</a>
-      </Link>
+      <Link href="/">Go Back</Link>
     </div>
     <p>This is the Level1 home page</p>
   </div>
diff --git a/test/integration/export/pages/about.js b/test/integration/export/pages/about.js
index 1003e4e45789b2..409d9407ca92da 100644
--- a/test/integration/export/pages/about.js
+++ b/test/integration/export/pages/about.js
@@ -5,9 +5,7 @@ const { publicRuntimeConfig, serverRuntimeConfig } = getConfig()
 const About = ({ bar }) => (
   <div id="about-page">
     <div>
-      <Link href="/">
-        <a>Go Back</a>
-      </Link>
+      <Link href="/">Go Back</Link>
     </div>
     <p>{`This is the About page ${publicRuntimeConfig.foo}${bar || ''}`}</p>
   </div>
diff --git a/test/integration/export/pages/button-link.js b/test/integration/export/pages/button-link.js
index 9f3427e665bf50..1f0c5540fe84ce 100644
--- a/test/integration/export/pages/button-link.js
+++ b/test/integration/export/pages/button-link.js
@@ -3,7 +3,7 @@ import Link from 'next/link'
 export default () => (
   <div id="button-link-page">
     <div>
-      <Link href="/" passHref>
+      <Link href="/" passHref legacyBehavior>
         <button>Go Back</button>
       </Link>
     </div>
diff --git a/test/integration/export/pages/counter.js b/test/integration/export/pages/counter.js
index 5360313b661869..6d3ceccf0ae361 100644
--- a/test/integration/export/pages/counter.js
+++ b/test/integration/export/pages/counter.js
@@ -13,8 +13,8 @@ export default class Counter extends React.Component {
     return (
       <div id="counter-page">
         <div>
-          <Link href="/">
-            <a id="go-back">Go Back</a>
+          <Link href="/" id="go-back">
+            Go Back
           </Link>
         </div>
         <p>Counter: {counter}</p>
diff --git a/test/integration/export/pages/dynamic-imports.js b/test/integration/export/pages/dynamic-imports.js
index 43ba2866bcf488..ec8f06e656e8a5 100644
--- a/test/integration/export/pages/dynamic-imports.js
+++ b/test/integration/export/pages/dynamic-imports.js
@@ -6,9 +6,7 @@ const DynamicComponent = dynamic(() => import('../components/hello'))
 export default () => (
   <div id="dynamic-imports-page">
     <div>
-      <Link href="/">
-        <a>Go Back</a>
-      </Link>
+      <Link href="/">Go Back</Link>
     </div>
     <DynamicComponent />
   </div>
diff --git a/test/integration/export/pages/dynamic.js b/test/integration/export/pages/dynamic.js
index 76fbdbc9981be7..3a0d4d426cdc70 100644
--- a/test/integration/export/pages/dynamic.js
+++ b/test/integration/export/pages/dynamic.js
@@ -21,9 +21,7 @@ export default class DynamicPage extends React.Component {
     return (
       <div id="dynamic-page">
         <div>
-          <Link href="/">
-            <a>Go Back</a>
-          </Link>
+          <Link href="/">Go Back</Link>
         </div>
         <p>{text}</p>
         <div id="hash">Hash: {hash}</div>
diff --git a/test/integration/export/pages/empty-hash-link.js b/test/integration/export/pages/empty-hash-link.js
index 8c570e61336de0..aeee465a80f542 100644
--- a/test/integration/export/pages/empty-hash-link.js
+++ b/test/integration/export/pages/empty-hash-link.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export default () => (
   <div id="empty-hash-link-page">
-    <Link href="/hello#">
-      <a id="empty-hash-link">Empty Hash link</a>
+    <Link href="/hello#" id="empty-hash-link">
+      Empty Hash link
     </Link>
   </div>
 )
diff --git a/test/integration/export/pages/empty-query-link.js b/test/integration/export/pages/empty-query-link.js
index 52064bcaba49d0..a020030bc96e1a 100644
--- a/test/integration/export/pages/empty-query-link.js
+++ b/test/integration/export/pages/empty-query-link.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export default () => (
   <div id="empty-query-link-page">
-    <Link href="/hello?">
-      <a id="empty-query-link">Empty Query link</a>
+    <Link href="/hello?" id="empty-query-link">
+      Empty Query link
     </Link>
   </div>
 )
diff --git a/test/integration/export/pages/hash-link.js b/test/integration/export/pages/hash-link.js
index 2332e0aee2c375..97378c65103902 100644
--- a/test/integration/export/pages/hash-link.js
+++ b/test/integration/export/pages/hash-link.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export default () => (
   <div id="hash-link-page">
-    <Link href="#hash">
-      <a id="hash-link">Hash link</a>
+    <Link href="#hash" id="hash-link">
+      Hash link
     </Link>
   </div>
 )
diff --git a/test/integration/export/pages/index.js b/test/integration/export/pages/index.js
index b5fb3a9384a2ec..a04deb4d6108bb 100644
--- a/test/integration/export/pages/index.js
+++ b/test/integration/export/pages/index.js
@@ -9,40 +9,52 @@ function routeToAbout(e) {
 export default () => (
   <div id="home-page">
     <div>
-      <Link href="/about">
+      <Link href="/about" legacyBehavior>
         <a id="about-via-link">About via Link</a>
       </Link>
       <a href="#" onClick={routeToAbout} id="about-via-router">
         About via Router
       </a>
-      <Link href="/counter">
+      <Link href="/counter" legacyBehavior>
         <a id="counter">Counter</a>
       </Link>
-      <Link href="/dynamic?text=cool+dynamic+text">
+      <Link href="/dynamic?text=cool+dynamic+text" legacyBehavior>
         <a id="get-initial-props">getInitialProps</a>
       </Link>
-      <Link href="/dynamic?text=next+export+is+nice" as="/dynamic/one">
+      <Link
+        href="/dynamic?text=next+export+is+nice"
+        as="/dynamic/one"
+        legacyBehavior
+      >
         <a id="dynamic-1">Dynamic 1</a>
       </Link>
-      <Link href="/dynamic?text=Vercel+is+awesome" as="/dynamic/two">
+      <Link
+        href="/dynamic?text=Vercel+is+awesome"
+        as="/dynamic/two"
+        legacyBehavior
+      >
         <a id="dynamic-2">Dynamic 2</a>
       </Link>
-      <Link href="/dynamic?text=Vercel+is+awesome#cool">
+      <Link href="/dynamic?text=Vercel+is+awesome#cool" legacyBehavior>
         <a id="with-hash">With Hash</a>
       </Link>
-      <Link href="/dynamic?text=this+file+has+an+extension" as="/file-name.md">
+      <Link
+        href="/dynamic?text=this+file+has+an+extension"
+        as="/file-name.md"
+        legacyBehavior
+      >
         <a id="path-with-extension">Path with extension</a>
       </Link>
-      <Link href="/level1">
+      <Link href="/level1" legacyBehavior>
         <a id="level1-home-page">Level1 home page</a>
       </Link>
-      <Link href="/level1/about">
+      <Link href="/level1/about" legacyBehavior>
         <a id="level1-about-page">Level1 about page</a>
       </Link>
-      <Link href="/dynamic-imports">
+      <Link href="/dynamic-imports" legacyBehavior>
         <a id="dynamic-imports-link">Dynamic imports page</a>
       </Link>
-      <Link href="/gsp-notfound">
+      <Link href="/gsp-notfound" legacyBehavior>
         <a id="gsp-notfound-link">GSP notfound page</a>
       </Link>
     </div>
diff --git a/test/integration/export/pages/level1/about.js b/test/integration/export/pages/level1/about.js
index 4455046b86c579..1f68cbd2e68630 100644
--- a/test/integration/export/pages/level1/about.js
+++ b/test/integration/export/pages/level1/about.js
@@ -3,9 +3,7 @@ import Link from 'next/link'
 export default () => (
   <div id="level1-about-page">
     <div>
-      <Link href="/">
-        <a>Go Back</a>
-      </Link>
+      <Link href="/">Go Back</Link>
     </div>
     <p>This is the Level1 about page</p>
   </div>
diff --git a/test/integration/export/pages/level1/index.js b/test/integration/export/pages/level1/index.js
index a285bcdac8aa4f..82e32702621fd2 100644
--- a/test/integration/export/pages/level1/index.js
+++ b/test/integration/export/pages/level1/index.js
@@ -3,9 +3,7 @@ import Link from 'next/link'
 export default () => (
   <div id="level1-home-page">
     <div>
-      <Link href="/">
-        <a>Go Back</a>
-      </Link>
+      <Link href="/">Go Back</Link>
     </div>
     <p>This is the Level1 home page</p>
   </div>
diff --git a/test/integration/font-optimization/fixtures/with-google/pages/index.js b/test/integration/font-optimization/fixtures/with-google/pages/index.js
index e32705671ee447..899838301059c3 100644
--- a/test/integration/font-optimization/fixtures/with-google/pages/index.js
+++ b/test/integration/font-optimization/fixtures/with-google/pages/index.js
@@ -7,8 +7,8 @@ const Page = () => {
       Hi!
       <br />
       <br />
-      <Link href="/with-font">
-        <a id="with-font">With font</a>
+      <Link href="/with-font" id="with-font">
+        With font
       </Link>
     </div>
   )
diff --git a/test/integration/font-optimization/fixtures/with-typekit/pages/index.js b/test/integration/font-optimization/fixtures/with-typekit/pages/index.js
index e32705671ee447..899838301059c3 100644
--- a/test/integration/font-optimization/fixtures/with-typekit/pages/index.js
+++ b/test/integration/font-optimization/fixtures/with-typekit/pages/index.js
@@ -7,8 +7,8 @@ const Page = () => {
       Hi!
       <br />
       <br />
-      <Link href="/with-font">
-        <a id="with-font">With font</a>
+      <Link href="/with-font" id="with-font">
+        With font
       </Link>
     </div>
   )
diff --git a/test/integration/getserversideprops-preview/pages/to-index.js b/test/integration/getserversideprops-preview/pages/to-index.js
index 3dc25e6c21a87a..d6b573948feed2 100644
--- a/test/integration/getserversideprops-preview/pages/to-index.js
+++ b/test/integration/getserversideprops-preview/pages/to-index.js
@@ -7,8 +7,8 @@ export function getServerSideProps() {
 export default function () {
   return (
     <main>
-      <Link href="/">
-        <a id="to-index">To Index</a>
+      <Link href="/" id="to-index">
+        To Index
       </Link>
     </main>
   )
diff --git a/test/integration/gssp-redirect-with-rewrites/pages/main-content.js b/test/integration/gssp-redirect-with-rewrites/pages/main-content.js
index 5a3af8bc2a15bb..8107dea10eab17 100644
--- a/test/integration/gssp-redirect-with-rewrites/pages/main-content.js
+++ b/test/integration/gssp-redirect-with-rewrites/pages/main-content.js
@@ -7,22 +7,27 @@ export default function MainContent({ message }) {
 
       <ul>
         <li>
-          <Link href="/redirector?redirect=/alias-to-main-content&message=refreshed">
-            <a id="link-with-rewritten-url" className={message}>
-              Link with rewritten target url
-            </a>
+          <Link
+            href="/redirector?redirect=/alias-to-main-content&message=refreshed"
+            id="link-with-rewritten-url"
+            className={message}
+          >
+            Link with rewritten target url
           </Link>
         </li>
 
         <li>
           <Link href="/redirector?redirect=/main-content&message=refreshWithClientSideNavigation">
-            <a>Link with client side navigation</a>
+            Link with client side navigation
           </Link>
         </li>
 
         <li>
-          <Link href="/redirector?redirect=/unknown-route">
-            <a id="link-unknown-url">Link to unknown internal navigation</a>
+          <Link
+            href="/redirector?redirect=/unknown-route"
+            id="link-unknown-url"
+          >
+            Link to unknown internal navigation
           </Link>
         </li>
       </ul>
diff --git a/test/integration/hydrate-then-render/pages/index.js b/test/integration/hydrate-then-render/pages/index.js
index 3e0391e20f5305..1f1738612d703b 100644
--- a/test/integration/hydrate-then-render/pages/index.js
+++ b/test/integration/hydrate-then-render/pages/index.js
@@ -5,8 +5,8 @@ const Home = () => {
     <div>
       <h1>Foo!</h1>
       <h2>bar!</h2>
-      <Link href="/other">
-        <a id="to-other">Other</a>
+      <Link href="/other" id="to-other">
+        Other
       </Link>
     </div>
   )
diff --git a/test/integration/i18n-support-base-path/pages/another.js b/test/integration/i18n-support-base-path/pages/another.js
index 20cdbe8c89a307..b52413a1bae541 100644
--- a/test/integration/i18n-support-base-path/pages/another.js
+++ b/test/integration/i18n-support-base-path/pages/another.js
@@ -14,8 +14,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support-base-path/pages/auto-export/index.js b/test/integration/i18n-support-base-path/pages/auto-export/index.js
index e425b50b257862..06433ed2aebd8a 100644
--- a/test/integration/i18n-support-base-path/pages/auto-export/index.js
+++ b/test/integration/i18n-support-base-path/pages/auto-export/index.js
@@ -14,8 +14,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
     </>
   )
diff --git a/test/integration/i18n-support-base-path/pages/developments/index.js b/test/integration/i18n-support-base-path/pages/developments/index.js
index cbd5858aec7ee5..f1c8bc3072c3bf 100644
--- a/test/integration/i18n-support-base-path/pages/developments/index.js
+++ b/test/integration/i18n-support-base-path/pages/developments/index.js
@@ -14,8 +14,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support-base-path/pages/dynamic/[slug].js b/test/integration/i18n-support-base-path/pages/dynamic/[slug].js
index ffab16e8b959d8..0fc5cfc8efb1ef 100644
--- a/test/integration/i18n-support-base-path/pages/dynamic/[slug].js
+++ b/test/integration/i18n-support-base-path/pages/dynamic/[slug].js
@@ -13,32 +13,32 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/another">
-        <a id="to-another">to /another</a>
+      <Link href="/another" id="to-another">
+        to /another
       </Link>
       <br />
-      <Link href="/gsp">
-        <a id="to-gsp">to /gsp</a>
+      <Link href="/gsp" id="to-gsp">
+        to /gsp
       </Link>
       <br />
-      <Link href="/gsp/fallback/first">
-        <a id="to-fallback-first">to /gsp/fallback/first</a>
+      <Link href="/gsp/fallback/first" id="to-fallback-first">
+        to /gsp/fallback/first
       </Link>
       <br />
-      <Link href="/gsp/fallback/hello">
-        <a id="to-fallback-hello">to /gsp/fallback/hello</a>
+      <Link href="/gsp/fallback/hello" id="to-fallback-hello">
+        to /gsp/fallback/hello
       </Link>
       <br />
-      <Link href="/gsp/no-fallback/first">
-        <a id="to-no-fallback-first">to /gsp/no-fallback/first</a>
+      <Link href="/gsp/no-fallback/first" id="to-no-fallback-first">
+        to /gsp/no-fallback/first
       </Link>
       <br />
-      <Link href="/gssp">
-        <a id="to-gssp">to /gssp</a>
+      <Link href="/gssp" id="to-gssp">
+        to /gssp
       </Link>
       <br />
-      <Link href="/gssp/first">
-        <a id="to-gssp-slug">to /gssp/first</a>
+      <Link href="/gssp/first" id="to-gssp-slug">
+        to /gssp/first
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support-base-path/pages/frank.js b/test/integration/i18n-support-base-path/pages/frank.js
index 6b51cabc71053f..d5b9b28900da05 100644
--- a/test/integration/i18n-support-base-path/pages/frank.js
+++ b/test/integration/i18n-support-base-path/pages/frank.js
@@ -14,32 +14,32 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/another">
-        <a id="to-another">to /another</a>
+      <Link href="/another" id="to-another">
+        to /another
       </Link>
       <br />
-      <Link href="/gsp">
-        <a id="to-gsp">to /gsp</a>
+      <Link href="/gsp" id="to-gsp">
+        to /gsp
       </Link>
       <br />
-      <Link href="/gsp/fallback/first">
-        <a id="to-fallback-first">to /gsp/fallback/first</a>
+      <Link href="/gsp/fallback/first" id="to-fallback-first">
+        to /gsp/fallback/first
       </Link>
       <br />
-      <Link href="/gsp/fallback/hello">
-        <a id="to-fallback-hello">to /gsp/fallback/hello</a>
+      <Link href="/gsp/fallback/hello" id="to-fallback-hello">
+        to /gsp/fallback/hello
       </Link>
       <br />
-      <Link href="/gsp/no-fallback/first">
-        <a id="to-no-fallback-first">to /gsp/no-fallback/first</a>
+      <Link href="/gsp/no-fallback/first" id="to-no-fallback-first">
+        to /gsp/no-fallback/first
       </Link>
       <br />
-      <Link href="/gssp">
-        <a id="to-gssp">to /gssp</a>
+      <Link href="/gssp" id="to-gssp">
+        to /gssp
       </Link>
       <br />
-      <Link href="/gssp/first">
-        <a id="to-gssp-slug">to /gssp/first</a>
+      <Link href="/gssp/first" id="to-gssp-slug">
+        to /gssp/first
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support-base-path/pages/gsp/fallback/[slug].js b/test/integration/i18n-support-base-path/pages/gsp/fallback/[slug].js
index 24c8547a2ccf0d..aa82f483ee0a1f 100644
--- a/test/integration/i18n-support-base-path/pages/gsp/fallback/[slug].js
+++ b/test/integration/i18n-support-base-path/pages/gsp/fallback/[slug].js
@@ -16,8 +16,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support-base-path/pages/gsp/index.js b/test/integration/i18n-support-base-path/pages/gsp/index.js
index 0c71c8f42e1a0f..d33ba345cf727e 100644
--- a/test/integration/i18n-support-base-path/pages/gsp/index.js
+++ b/test/integration/i18n-support-base-path/pages/gsp/index.js
@@ -14,8 +14,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support-base-path/pages/gsp/no-fallback/[slug].js b/test/integration/i18n-support-base-path/pages/gsp/no-fallback/[slug].js
index 91a4d74bea5834..cbbd0719afd320 100644
--- a/test/integration/i18n-support-base-path/pages/gsp/no-fallback/[slug].js
+++ b/test/integration/i18n-support-base-path/pages/gsp/no-fallback/[slug].js
@@ -16,8 +16,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support-base-path/pages/gssp/[slug].js b/test/integration/i18n-support-base-path/pages/gssp/[slug].js
index 2d2be9dc3f1c71..b93476d3dfc7aa 100644
--- a/test/integration/i18n-support-base-path/pages/gssp/[slug].js
+++ b/test/integration/i18n-support-base-path/pages/gssp/[slug].js
@@ -14,8 +14,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support-base-path/pages/gssp/index.js b/test/integration/i18n-support-base-path/pages/gssp/index.js
index 4d566474e10d3b..b9d17e66bb85a0 100644
--- a/test/integration/i18n-support-base-path/pages/gssp/index.js
+++ b/test/integration/i18n-support-base-path/pages/gssp/index.js
@@ -14,8 +14,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support-base-path/pages/index.js b/test/integration/i18n-support-base-path/pages/index.js
index c26939f651480a..1dd08c94e1776b 100644
--- a/test/integration/i18n-support-base-path/pages/index.js
+++ b/test/integration/i18n-support-base-path/pages/index.js
@@ -25,40 +25,40 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{asPath}</p>
-      <Link href="/another">
-        <a id="to-another">to /another</a>
+      <Link href="/another" id="to-another">
+        to /another
       </Link>
       <br />
-      <Link href="/dynamic/first">
-        <a id="to-dynamic">to /dynamic/first</a>
+      <Link href="/dynamic/first" id="to-dynamic">
+        to /dynamic/first
       </Link>
       <br />
-      <Link href="/gsp">
-        <a id="to-gsp">to /gsp</a>
+      <Link href="/gsp" id="to-gsp">
+        to /gsp
       </Link>
       <br />
-      <Link href="/gsp/fallback/first">
-        <a id="to-fallback-first">to /gsp/fallback/first</a>
+      <Link href="/gsp/fallback/first" id="to-fallback-first">
+        to /gsp/fallback/first
       </Link>
       <br />
-      <Link href="/gsp/fallback/hello">
-        <a id="to-fallback-hello">to /gsp/fallback/hello</a>
+      <Link href="/gsp/fallback/hello" id="to-fallback-hello">
+        to /gsp/fallback/hello
       </Link>
       <br />
-      <Link href="/gsp/no-fallback/first">
-        <a id="to-no-fallback-first">to /gsp/no-fallback/first</a>
+      <Link href="/gsp/no-fallback/first" id="to-no-fallback-first">
+        to /gsp/no-fallback/first
       </Link>
       <br />
-      <Link href="/gssp">
-        <a id="to-gssp">to /gssp</a>
+      <Link href="/gssp" id="to-gssp">
+        to /gssp
       </Link>
       <br />
-      <Link href="/gssp/first">
-        <a id="to-gssp-slug">to /gssp/first</a>
+      <Link href="/gssp/first" id="to-gssp-slug">
+        to /gssp/first
       </Link>
       <br />
-      <Link href="/api/post/asdf">
-        <a id="to-api-post">to /api/post/[slug]</a>
+      <Link href="/api/post/asdf" id="to-api-post">
+        to /api/post/[slug]
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support-base-path/pages/links.js b/test/integration/i18n-support-base-path/pages/links.js
index 247a92d33dad5a..1310e50ca044aa 100644
--- a/test/integration/i18n-support-base-path/pages/links.js
+++ b/test/integration/i18n-support-base-path/pages/links.js
@@ -15,32 +15,44 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/another" locale={nextLocale}>
-        <a id="to-another">to /another</a>
+      <Link href="/another" locale={nextLocale} id="to-another">
+        to /another
       </Link>
       <br />
-      <Link href="/gsp" locale={nextLocale}>
-        <a id="to-gsp">to /gsp</a>
+      <Link href="/gsp" locale={nextLocale} id="to-gsp">
+        to /gsp
       </Link>
       <br />
-      <Link href="/gsp/fallback/first" locale={nextLocale}>
-        <a id="to-fallback-first">to /gsp/fallback/first</a>
+      <Link
+        href="/gsp/fallback/first"
+        locale={nextLocale}
+        id="to-fallback-first"
+      >
+        to /gsp/fallback/first
       </Link>
       <br />
-      <Link href="/gsp/fallback/hello" locale={nextLocale}>
-        <a id="to-fallback-hello">to /gsp/fallback/hello</a>
+      <Link
+        href="/gsp/fallback/hello"
+        locale={nextLocale}
+        id="to-fallback-hello"
+      >
+        to /gsp/fallback/hello
       </Link>
       <br />
-      <Link href="/gsp/no-fallback/first" locale={nextLocale}>
-        <a id="to-no-fallback-first">to /gsp/no-fallback/first</a>
+      <Link
+        href="/gsp/no-fallback/first"
+        locale={nextLocale}
+        id="to-no-fallback-first"
+      >
+        to /gsp/no-fallback/first
       </Link>
       <br />
-      <Link href="/gssp" locale={nextLocale}>
-        <a id="to-gssp">to /gssp</a>
+      <Link href="/gssp" locale={nextLocale} id="to-gssp">
+        to /gssp
       </Link>
       <br />
-      <Link href="/gssp/first" locale={nextLocale}>
-        <a id="to-gssp-slug">to /gssp/first</a>
+      <Link href="/gssp/first" locale={nextLocale} id="to-gssp-slug">
+        to /gssp/first
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support-base-path/pages/locale-false.js b/test/integration/i18n-support-base-path/pages/locale-false.js
index e0de4c056aeea0..a6f15ca71b8bfa 100644
--- a/test/integration/i18n-support-base-path/pages/locale-false.js
+++ b/test/integration/i18n-support-base-path/pages/locale-false.js
@@ -14,40 +14,52 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href={`/${nextLocale}/another`} locale={false}>
-        <a id="to-another">to /another</a>
+      <Link href={`/${nextLocale}/another`} locale={false} id="to-another">
+        to /another
       </Link>
       <br />
-      <Link href={`/${nextLocale}/gsp`} locale={false}>
-        <a id="to-gsp">to /gsp</a>
+      <Link href={`/${nextLocale}/gsp`} locale={false} id="to-gsp">
+        to /gsp
       </Link>
       <br />
-      <Link href={`/${nextLocale}/gsp/fallback/first`} locale={false}>
-        <a id="to-fallback-first">to /gsp/fallback/first</a>
+      <Link
+        href={`/${nextLocale}/gsp/fallback/first`}
+        locale={false}
+        id="to-fallback-first"
+      >
+        to /gsp/fallback/first
       </Link>
       <br />
-      <Link href={`/${nextLocale}/gsp/fallback/hello`} locale={false}>
-        <a id="to-fallback-hello">to /gsp/fallback/hello</a>
+      <Link
+        href={`/${nextLocale}/gsp/fallback/hello`}
+        locale={false}
+        id="to-fallback-hello"
+      >
+        to /gsp/fallback/hello
       </Link>
       <br />
-      <Link href={`/${nextLocale}/gsp/no-fallback/first`} locale={false}>
-        <a id="to-no-fallback-first">to /gsp/no-fallback/first</a>
+      <Link
+        href={`/${nextLocale}/gsp/no-fallback/first`}
+        locale={false}
+        id="to-no-fallback-first"
+      >
+        to /gsp/no-fallback/first
       </Link>
       <br />
-      <Link href={`/${nextLocale}/gssp`} locale={false}>
-        <a id="to-gssp">to /gssp</a>
+      <Link href={`/${nextLocale}/gssp`} locale={false} id="to-gssp">
+        to /gssp
       </Link>
       <br />
-      <Link href={`/${nextLocale}/gssp/first`} locale={false}>
-        <a id="to-gssp-slug">to /gssp/first</a>
+      <Link href={`/${nextLocale}/gssp/first`} locale={false} id="to-gssp-slug">
+        to /gssp/first
       </Link>
       <br />
-      <Link href={`/gssp/first`} locale={false}>
-        <a id="to-gssp-slug-default">to /gssp/first (default locale)</a>
+      <Link href={`/gssp/first`} locale={false} id="to-gssp-slug-default">
+        to /gssp/first (default locale)
       </Link>
       <br />
-      <Link href={`/gsp`} locale={false}>
-        <a id="to-gsp-default">to /gsp (default locale)</a>
+      <Link href={`/gsp`} locale={false} id="to-gsp-default">
+        to /gsp (default locale)
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support-base-path/pages/mixed.js b/test/integration/i18n-support-base-path/pages/mixed.js
index f1939e78f852fe..eab2a5c7ee821c 100644
--- a/test/integration/i18n-support-base-path/pages/mixed.js
+++ b/test/integration/i18n-support-base-path/pages/mixed.js
@@ -15,23 +15,23 @@ export default function Page(props) {
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
 
-      <Link href="/gsp" locale="en-US">
-        <a id="to-gsp-en-us">to /gsp</a>
+      <Link href="/gsp" locale="en-US" id="to-gsp-en-us">
+        to /gsp
       </Link>
       <br />
 
-      <Link href="/gsp" locale="nl-NL">
-        <a id="to-gsp-nl-nl">to /gsp</a>
+      <Link href="/gsp" locale="nl-NL" id="to-gsp-nl-nl">
+        to /gsp
       </Link>
       <br />
 
-      <Link href="/gsp" locale="fr">
-        <a id="to-gsp-fr">to /gsp</a>
+      <Link href="/gsp" locale="fr" id="to-gsp-fr">
+        to /gsp
       </Link>
       <br />
 
-      <Link href="/" locale="fr">
-        <a id="to-index-fr">to /</a>
+      <Link href="/" locale="fr" id="to-index-fr">
+        to /
       </Link>
     </>
   )
diff --git a/test/integration/i18n-support-base-path/pages/not-found/blocking-fallback/[slug].js b/test/integration/i18n-support-base-path/pages/not-found/blocking-fallback/[slug].js
index c17c1250573e74..52f874d3cf7cb0 100644
--- a/test/integration/i18n-support-base-path/pages/not-found/blocking-fallback/[slug].js
+++ b/test/integration/i18n-support-base-path/pages/not-found/blocking-fallback/[slug].js
@@ -13,8 +13,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support-base-path/pages/not-found/fallback/[slug].js b/test/integration/i18n-support-base-path/pages/not-found/fallback/[slug].js
index 6bca78d173b1b6..133c504f3cc313 100644
--- a/test/integration/i18n-support-base-path/pages/not-found/fallback/[slug].js
+++ b/test/integration/i18n-support-base-path/pages/not-found/fallback/[slug].js
@@ -15,8 +15,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support-base-path/pages/not-found/index.js b/test/integration/i18n-support-base-path/pages/not-found/index.js
index b6652953a9af6e..3017ec113a6187 100644
--- a/test/integration/i18n-support-base-path/pages/not-found/index.js
+++ b/test/integration/i18n-support-base-path/pages/not-found/index.js
@@ -13,8 +13,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support-catchall/pages/[[...slug]].js b/test/integration/i18n-support-catchall/pages/[[...slug]].js
index 33504f801f97d9..eba40732bf0913 100644
--- a/test/integration/i18n-support-catchall/pages/[[...slug]].js
+++ b/test/integration/i18n-support-catchall/pages/[[...slug]].js
@@ -15,33 +15,33 @@ export default function Page(props) {
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
 
-      <Link href="/" locale="en-US">
-        <a id="to-def-locale-index">to /</a>
+      <Link href="/" locale="en-US" id="to-def-locale-index">
+        to /
       </Link>
       <br />
 
-      <Link href="/another" locale="en-US">
-        <a id="to-def-locale-another">to /another</a>
+      <Link href="/another" locale="en-US" id="to-def-locale-another">
+        to /another
       </Link>
       <br />
 
-      <Link href="/" locale="nl-NL">
-        <a id="to-locale-index">to /nl-nl</a>
+      <Link href="/" locale="nl-NL" id="to-locale-index">
+        to /nl-nl
       </Link>
       <br />
 
-      <Link href="/another" locale="nl-NL">
-        <a id="to-locale-another">to /nl-nl/another</a>
+      <Link href="/another" locale="nl-NL" id="to-locale-another">
+        to /nl-nl/another
       </Link>
       <br />
 
-      <Link href="/fr" locale={false}>
-        <a id="to-fr-locale-index">to /fr</a>
+      <Link href="/fr" locale={false} id="to-fr-locale-index">
+        to /fr
       </Link>
       <br />
 
-      <Link href="/fr/another" locale={false}>
-        <a id="to-fr-locale-another">to /fr/another</a>
+      <Link href="/fr/another" locale={false} id="to-fr-locale-another">
+        to /fr/another
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support-same-page-hash-change/pages/about.js b/test/integration/i18n-support-same-page-hash-change/pages/about.js
index bc0d213c9e7b99..d533f8753306b7 100644
--- a/test/integration/i18n-support-same-page-hash-change/pages/about.js
+++ b/test/integration/i18n-support-same-page-hash-change/pages/about.js
@@ -31,11 +31,12 @@ export default function Page(props) {
       <Link
         href={{ pathname: router.pathname, query: router.query, hash: '#hash' }}
         locale={router.locale === 'fr' ? 'en' : 'fr'}
+        id="change-locale"
       >
-        <a id="change-locale">Change Locale</a>
+        Change Locale
       </Link>
-      <Link href={{ hash: '#newhash' }}>
-        <a id="hash-change">Hash Change</a>
+      <Link href={{ hash: '#newhash' }} id="hash-change">
+        Hash Change
       </Link>
     </>
   )
diff --git a/test/integration/i18n-support-same-page-hash-change/pages/posts/[...slug].js b/test/integration/i18n-support-same-page-hash-change/pages/posts/[...slug].js
index 385d003540fedb..72a520a0d9cb11 100644
--- a/test/integration/i18n-support-same-page-hash-change/pages/posts/[...slug].js
+++ b/test/integration/i18n-support-same-page-hash-change/pages/posts/[...slug].js
@@ -11,8 +11,9 @@ export default function Page(props) {
       <Link
         href={{ pathname: router.pathname, query: router.query, hash: '#hash' }}
         locale={router.locale === 'fr' ? 'en' : 'fr'}
+        id="change-locale"
       >
-        <a id="change-locale">Change Locale</a>
+        Change Locale
       </Link>
     </>
   )
diff --git a/test/integration/i18n-support/pages/another.js b/test/integration/i18n-support/pages/another.js
index 20cdbe8c89a307..b52413a1bae541 100644
--- a/test/integration/i18n-support/pages/another.js
+++ b/test/integration/i18n-support/pages/another.js
@@ -14,8 +14,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support/pages/auto-export/index.js b/test/integration/i18n-support/pages/auto-export/index.js
index e425b50b257862..06433ed2aebd8a 100644
--- a/test/integration/i18n-support/pages/auto-export/index.js
+++ b/test/integration/i18n-support/pages/auto-export/index.js
@@ -14,8 +14,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
     </>
   )
diff --git a/test/integration/i18n-support/pages/developments/index.js b/test/integration/i18n-support/pages/developments/index.js
index cbd5858aec7ee5..f1c8bc3072c3bf 100644
--- a/test/integration/i18n-support/pages/developments/index.js
+++ b/test/integration/i18n-support/pages/developments/index.js
@@ -14,8 +14,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support/pages/dynamic/[slug].js b/test/integration/i18n-support/pages/dynamic/[slug].js
index ffab16e8b959d8..0fc5cfc8efb1ef 100644
--- a/test/integration/i18n-support/pages/dynamic/[slug].js
+++ b/test/integration/i18n-support/pages/dynamic/[slug].js
@@ -13,32 +13,32 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/another">
-        <a id="to-another">to /another</a>
+      <Link href="/another" id="to-another">
+        to /another
       </Link>
       <br />
-      <Link href="/gsp">
-        <a id="to-gsp">to /gsp</a>
+      <Link href="/gsp" id="to-gsp">
+        to /gsp
       </Link>
       <br />
-      <Link href="/gsp/fallback/first">
-        <a id="to-fallback-first">to /gsp/fallback/first</a>
+      <Link href="/gsp/fallback/first" id="to-fallback-first">
+        to /gsp/fallback/first
       </Link>
       <br />
-      <Link href="/gsp/fallback/hello">
-        <a id="to-fallback-hello">to /gsp/fallback/hello</a>
+      <Link href="/gsp/fallback/hello" id="to-fallback-hello">
+        to /gsp/fallback/hello
       </Link>
       <br />
-      <Link href="/gsp/no-fallback/first">
-        <a id="to-no-fallback-first">to /gsp/no-fallback/first</a>
+      <Link href="/gsp/no-fallback/first" id="to-no-fallback-first">
+        to /gsp/no-fallback/first
       </Link>
       <br />
-      <Link href="/gssp">
-        <a id="to-gssp">to /gssp</a>
+      <Link href="/gssp" id="to-gssp">
+        to /gssp
       </Link>
       <br />
-      <Link href="/gssp/first">
-        <a id="to-gssp-slug">to /gssp/first</a>
+      <Link href="/gssp/first" id="to-gssp-slug">
+        to /gssp/first
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support/pages/frank.js b/test/integration/i18n-support/pages/frank.js
index 6b51cabc71053f..d5b9b28900da05 100644
--- a/test/integration/i18n-support/pages/frank.js
+++ b/test/integration/i18n-support/pages/frank.js
@@ -14,32 +14,32 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/another">
-        <a id="to-another">to /another</a>
+      <Link href="/another" id="to-another">
+        to /another
       </Link>
       <br />
-      <Link href="/gsp">
-        <a id="to-gsp">to /gsp</a>
+      <Link href="/gsp" id="to-gsp">
+        to /gsp
       </Link>
       <br />
-      <Link href="/gsp/fallback/first">
-        <a id="to-fallback-first">to /gsp/fallback/first</a>
+      <Link href="/gsp/fallback/first" id="to-fallback-first">
+        to /gsp/fallback/first
       </Link>
       <br />
-      <Link href="/gsp/fallback/hello">
-        <a id="to-fallback-hello">to /gsp/fallback/hello</a>
+      <Link href="/gsp/fallback/hello" id="to-fallback-hello">
+        to /gsp/fallback/hello
       </Link>
       <br />
-      <Link href="/gsp/no-fallback/first">
-        <a id="to-no-fallback-first">to /gsp/no-fallback/first</a>
+      <Link href="/gsp/no-fallback/first" id="to-no-fallback-first">
+        to /gsp/no-fallback/first
       </Link>
       <br />
-      <Link href="/gssp">
-        <a id="to-gssp">to /gssp</a>
+      <Link href="/gssp" id="to-gssp">
+        to /gssp
       </Link>
       <br />
-      <Link href="/gssp/first">
-        <a id="to-gssp-slug">to /gssp/first</a>
+      <Link href="/gssp/first" id="to-gssp-slug">
+        to /gssp/first
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support/pages/gsp/fallback/[slug].js b/test/integration/i18n-support/pages/gsp/fallback/[slug].js
index 07e1491c643164..159820df741fa0 100644
--- a/test/integration/i18n-support/pages/gsp/fallback/[slug].js
+++ b/test/integration/i18n-support/pages/gsp/fallback/[slug].js
@@ -23,8 +23,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support/pages/gsp/index.js b/test/integration/i18n-support/pages/gsp/index.js
index 0c71c8f42e1a0f..d33ba345cf727e 100644
--- a/test/integration/i18n-support/pages/gsp/index.js
+++ b/test/integration/i18n-support/pages/gsp/index.js
@@ -14,8 +14,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support/pages/gsp/no-fallback/[slug].js b/test/integration/i18n-support/pages/gsp/no-fallback/[slug].js
index 91a4d74bea5834..cbbd0719afd320 100644
--- a/test/integration/i18n-support/pages/gsp/no-fallback/[slug].js
+++ b/test/integration/i18n-support/pages/gsp/no-fallback/[slug].js
@@ -16,8 +16,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support/pages/gssp/[slug].js b/test/integration/i18n-support/pages/gssp/[slug].js
index 2d2be9dc3f1c71..b93476d3dfc7aa 100644
--- a/test/integration/i18n-support/pages/gssp/[slug].js
+++ b/test/integration/i18n-support/pages/gssp/[slug].js
@@ -14,8 +14,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support/pages/gssp/index.js b/test/integration/i18n-support/pages/gssp/index.js
index 4d566474e10d3b..b9d17e66bb85a0 100644
--- a/test/integration/i18n-support/pages/gssp/index.js
+++ b/test/integration/i18n-support/pages/gssp/index.js
@@ -14,8 +14,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support/pages/index.js b/test/integration/i18n-support/pages/index.js
index c26939f651480a..1dd08c94e1776b 100644
--- a/test/integration/i18n-support/pages/index.js
+++ b/test/integration/i18n-support/pages/index.js
@@ -25,40 +25,40 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{asPath}</p>
-      <Link href="/another">
-        <a id="to-another">to /another</a>
+      <Link href="/another" id="to-another">
+        to /another
       </Link>
       <br />
-      <Link href="/dynamic/first">
-        <a id="to-dynamic">to /dynamic/first</a>
+      <Link href="/dynamic/first" id="to-dynamic">
+        to /dynamic/first
       </Link>
       <br />
-      <Link href="/gsp">
-        <a id="to-gsp">to /gsp</a>
+      <Link href="/gsp" id="to-gsp">
+        to /gsp
       </Link>
       <br />
-      <Link href="/gsp/fallback/first">
-        <a id="to-fallback-first">to /gsp/fallback/first</a>
+      <Link href="/gsp/fallback/first" id="to-fallback-first">
+        to /gsp/fallback/first
       </Link>
       <br />
-      <Link href="/gsp/fallback/hello">
-        <a id="to-fallback-hello">to /gsp/fallback/hello</a>
+      <Link href="/gsp/fallback/hello" id="to-fallback-hello">
+        to /gsp/fallback/hello
       </Link>
       <br />
-      <Link href="/gsp/no-fallback/first">
-        <a id="to-no-fallback-first">to /gsp/no-fallback/first</a>
+      <Link href="/gsp/no-fallback/first" id="to-no-fallback-first">
+        to /gsp/no-fallback/first
       </Link>
       <br />
-      <Link href="/gssp">
-        <a id="to-gssp">to /gssp</a>
+      <Link href="/gssp" id="to-gssp">
+        to /gssp
       </Link>
       <br />
-      <Link href="/gssp/first">
-        <a id="to-gssp-slug">to /gssp/first</a>
+      <Link href="/gssp/first" id="to-gssp-slug">
+        to /gssp/first
       </Link>
       <br />
-      <Link href="/api/post/asdf">
-        <a id="to-api-post">to /api/post/[slug]</a>
+      <Link href="/api/post/asdf" id="to-api-post">
+        to /api/post/[slug]
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support/pages/links.js b/test/integration/i18n-support/pages/links.js
index 247a92d33dad5a..1310e50ca044aa 100644
--- a/test/integration/i18n-support/pages/links.js
+++ b/test/integration/i18n-support/pages/links.js
@@ -15,32 +15,44 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/another" locale={nextLocale}>
-        <a id="to-another">to /another</a>
+      <Link href="/another" locale={nextLocale} id="to-another">
+        to /another
       </Link>
       <br />
-      <Link href="/gsp" locale={nextLocale}>
-        <a id="to-gsp">to /gsp</a>
+      <Link href="/gsp" locale={nextLocale} id="to-gsp">
+        to /gsp
       </Link>
       <br />
-      <Link href="/gsp/fallback/first" locale={nextLocale}>
-        <a id="to-fallback-first">to /gsp/fallback/first</a>
+      <Link
+        href="/gsp/fallback/first"
+        locale={nextLocale}
+        id="to-fallback-first"
+      >
+        to /gsp/fallback/first
       </Link>
       <br />
-      <Link href="/gsp/fallback/hello" locale={nextLocale}>
-        <a id="to-fallback-hello">to /gsp/fallback/hello</a>
+      <Link
+        href="/gsp/fallback/hello"
+        locale={nextLocale}
+        id="to-fallback-hello"
+      >
+        to /gsp/fallback/hello
       </Link>
       <br />
-      <Link href="/gsp/no-fallback/first" locale={nextLocale}>
-        <a id="to-no-fallback-first">to /gsp/no-fallback/first</a>
+      <Link
+        href="/gsp/no-fallback/first"
+        locale={nextLocale}
+        id="to-no-fallback-first"
+      >
+        to /gsp/no-fallback/first
       </Link>
       <br />
-      <Link href="/gssp" locale={nextLocale}>
-        <a id="to-gssp">to /gssp</a>
+      <Link href="/gssp" locale={nextLocale} id="to-gssp">
+        to /gssp
       </Link>
       <br />
-      <Link href="/gssp/first" locale={nextLocale}>
-        <a id="to-gssp-slug">to /gssp/first</a>
+      <Link href="/gssp/first" locale={nextLocale} id="to-gssp-slug">
+        to /gssp/first
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support/pages/locale-false.js b/test/integration/i18n-support/pages/locale-false.js
index e0de4c056aeea0..a6f15ca71b8bfa 100644
--- a/test/integration/i18n-support/pages/locale-false.js
+++ b/test/integration/i18n-support/pages/locale-false.js
@@ -14,40 +14,52 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href={`/${nextLocale}/another`} locale={false}>
-        <a id="to-another">to /another</a>
+      <Link href={`/${nextLocale}/another`} locale={false} id="to-another">
+        to /another
       </Link>
       <br />
-      <Link href={`/${nextLocale}/gsp`} locale={false}>
-        <a id="to-gsp">to /gsp</a>
+      <Link href={`/${nextLocale}/gsp`} locale={false} id="to-gsp">
+        to /gsp
       </Link>
       <br />
-      <Link href={`/${nextLocale}/gsp/fallback/first`} locale={false}>
-        <a id="to-fallback-first">to /gsp/fallback/first</a>
+      <Link
+        href={`/${nextLocale}/gsp/fallback/first`}
+        locale={false}
+        id="to-fallback-first"
+      >
+        to /gsp/fallback/first
       </Link>
       <br />
-      <Link href={`/${nextLocale}/gsp/fallback/hello`} locale={false}>
-        <a id="to-fallback-hello">to /gsp/fallback/hello</a>
+      <Link
+        href={`/${nextLocale}/gsp/fallback/hello`}
+        locale={false}
+        id="to-fallback-hello"
+      >
+        to /gsp/fallback/hello
       </Link>
       <br />
-      <Link href={`/${nextLocale}/gsp/no-fallback/first`} locale={false}>
-        <a id="to-no-fallback-first">to /gsp/no-fallback/first</a>
+      <Link
+        href={`/${nextLocale}/gsp/no-fallback/first`}
+        locale={false}
+        id="to-no-fallback-first"
+      >
+        to /gsp/no-fallback/first
       </Link>
       <br />
-      <Link href={`/${nextLocale}/gssp`} locale={false}>
-        <a id="to-gssp">to /gssp</a>
+      <Link href={`/${nextLocale}/gssp`} locale={false} id="to-gssp">
+        to /gssp
       </Link>
       <br />
-      <Link href={`/${nextLocale}/gssp/first`} locale={false}>
-        <a id="to-gssp-slug">to /gssp/first</a>
+      <Link href={`/${nextLocale}/gssp/first`} locale={false} id="to-gssp-slug">
+        to /gssp/first
       </Link>
       <br />
-      <Link href={`/gssp/first`} locale={false}>
-        <a id="to-gssp-slug-default">to /gssp/first (default locale)</a>
+      <Link href={`/gssp/first`} locale={false} id="to-gssp-slug-default">
+        to /gssp/first (default locale)
       </Link>
       <br />
-      <Link href={`/gsp`} locale={false}>
-        <a id="to-gsp-default">to /gsp (default locale)</a>
+      <Link href={`/gsp`} locale={false} id="to-gsp-default">
+        to /gsp (default locale)
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support/pages/mixed.js b/test/integration/i18n-support/pages/mixed.js
index f1939e78f852fe..eab2a5c7ee821c 100644
--- a/test/integration/i18n-support/pages/mixed.js
+++ b/test/integration/i18n-support/pages/mixed.js
@@ -15,23 +15,23 @@ export default function Page(props) {
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
 
-      <Link href="/gsp" locale="en-US">
-        <a id="to-gsp-en-us">to /gsp</a>
+      <Link href="/gsp" locale="en-US" id="to-gsp-en-us">
+        to /gsp
       </Link>
       <br />
 
-      <Link href="/gsp" locale="nl-NL">
-        <a id="to-gsp-nl-nl">to /gsp</a>
+      <Link href="/gsp" locale="nl-NL" id="to-gsp-nl-nl">
+        to /gsp
       </Link>
       <br />
 
-      <Link href="/gsp" locale="fr">
-        <a id="to-gsp-fr">to /gsp</a>
+      <Link href="/gsp" locale="fr" id="to-gsp-fr">
+        to /gsp
       </Link>
       <br />
 
-      <Link href="/" locale="fr">
-        <a id="to-index-fr">to /</a>
+      <Link href="/" locale="fr" id="to-index-fr">
+        to /
       </Link>
     </>
   )
diff --git a/test/integration/i18n-support/pages/not-found/blocking-fallback/[slug].js b/test/integration/i18n-support/pages/not-found/blocking-fallback/[slug].js
index c17c1250573e74..52f874d3cf7cb0 100644
--- a/test/integration/i18n-support/pages/not-found/blocking-fallback/[slug].js
+++ b/test/integration/i18n-support/pages/not-found/blocking-fallback/[slug].js
@@ -13,8 +13,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support/pages/not-found/fallback/[slug].js b/test/integration/i18n-support/pages/not-found/fallback/[slug].js
index 6bca78d173b1b6..133c504f3cc313 100644
--- a/test/integration/i18n-support/pages/not-found/fallback/[slug].js
+++ b/test/integration/i18n-support/pages/not-found/fallback/[slug].js
@@ -15,8 +15,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/integration/i18n-support/pages/not-found/index.js b/test/integration/i18n-support/pages/not-found/index.js
index b6652953a9af6e..3017ec113a6187 100644
--- a/test/integration/i18n-support/pages/not-found/index.js
+++ b/test/integration/i18n-support/pages/not-found/index.js
@@ -13,8 +13,8 @@ export default function Page(props) {
       <p id="router-query">{JSON.stringify(router.query)}</p>
       <p id="router-pathname">{router.pathname}</p>
       <p id="router-as-path">{router.asPath}</p>
-      <Link href="/">
-        <a id="to-index">to /</a>
+      <Link href="/" id="to-index">
+        to /
       </Link>
       <br />
     </>
diff --git a/test/integration/index-index/pages/links.js b/test/integration/index-index/pages/links.js
index d95c2436a05506..bab4d62b6df1c1 100644
--- a/test/integration/index-index/pages/links.js
+++ b/test/integration/index-index/pages/links.js
@@ -3,28 +3,28 @@ import Link from 'next/link'
 export default function Index() {
   return (
     <div id="page">
-      <Link href="/">
-        <a id="link1">link to /</a>
+      <Link href="/" id="link1">
+        link to /
       </Link>
       {' | '}
-      <Link href="/index">
-        <a id="link2">link to /index</a>
+      <Link href="/index" id="link2">
+        link to /index
       </Link>
       {' | '}
-      <Link href="/index/index">
-        <a id="link3">link to /index/index</a>
+      <Link href="/index/index" id="link3">
+        link to /index/index
       </Link>
       {' | '}
-      <Link href="/index/index/index">
-        <a id="link4">link to /index/index/index</a>
+      <Link href="/index/index/index" id="link4">
+        link to /index/index/index
       </Link>
       {' | '}
-      <Link href="/index/user">
-        <a id="link5">link to /index/user</a>
+      <Link href="/index/user" id="link5">
+        link to /index/user
       </Link>
       {' | '}
-      <Link href="/index/project">
-        <a id="link6">link to /index/project</a>
+      <Link href="/index/project" id="link6">
+        link to /index/project
       </Link>
     </div>
   )
diff --git a/test/integration/invalid-href/pages/dynamic-route-mismatch-manual.js b/test/integration/invalid-href/pages/dynamic-route-mismatch-manual.js
index 150cd647dbb2b1..78d2ac657a5be4 100644
--- a/test/integration/invalid-href/pages/dynamic-route-mismatch-manual.js
+++ b/test/integration/invalid-href/pages/dynamic-route-mismatch-manual.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export default function Page() {
   return (
-    <Link href="/[post]?post=post-1" as="/blog/post-1">
-      <a id="click-me">Click me</a>
+    <Link href="/[post]?post=post-1" as="/blog/post-1" id="click-me">
+      Click me
     </Link>
   )
 }
diff --git a/test/integration/invalid-href/pages/dynamic-route-mismatch.js b/test/integration/invalid-href/pages/dynamic-route-mismatch.js
index ccac5d67ab9a28..2e6cd0d8c5d3aa 100644
--- a/test/integration/invalid-href/pages/dynamic-route-mismatch.js
+++ b/test/integration/invalid-href/pages/dynamic-route-mismatch.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export default function Page() {
   return (
-    <Link href="/[post]" as="/blog/post-1">
-      <a id="click-me">Click me</a>
+    <Link href="/[post]" as="/blog/post-1" id="click-me">
+      Click me
     </Link>
   )
 }
diff --git a/test/integration/invalid-href/pages/first.js b/test/integration/invalid-href/pages/first.js
index 885566523b7bbb..88eef741ec33b4 100644
--- a/test/integration/invalid-href/pages/first.js
+++ b/test/integration/invalid-href/pages/first.js
@@ -20,8 +20,8 @@ export default function Page() {
   ) : (
     // this should throw an error on load since prefetch
     // receives the invalid href
-    <Link href={invalidLink}>
-      <a id="click-me">invalid link :o</a>
+    <Link href={invalidLink} id="click-me">
+      invalid link :o
     </Link>
   )
 }
diff --git a/test/integration/invalid-href/pages/invalid-relative.js b/test/integration/invalid-href/pages/invalid-relative.js
index 1acc7f63076e40..f84062e55ac751 100644
--- a/test/integration/invalid-href/pages/invalid-relative.js
+++ b/test/integration/invalid-href/pages/invalid-relative.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export default function Page() {
   return (
-    <Link href="/second" as="mailto:hello@example.com">
-      <a id="click-me">email</a>
+    <Link href="/second" as="mailto:hello@example.com" id="click-me">
+      email
     </Link>
   )
 }
diff --git a/test/integration/invalid-href/pages/second.js b/test/integration/invalid-href/pages/second.js
index 09af70d09ddf7f..5f62dfc6566066 100644
--- a/test/integration/invalid-href/pages/second.js
+++ b/test/integration/invalid-href/pages/second.js
@@ -20,8 +20,8 @@ export default function Page() {
   ) : (
     // this should throw an error on load since prefetch
     // receives the invalid href
-    <Link href={invalidLink}>
-      <a id="click-me">invalid link :o</a>
+    <Link href={invalidLink} id="click-me">
+      invalid link :o
     </Link>
   )
 }
diff --git a/test/integration/invalid-href/pages/third.js b/test/integration/invalid-href/pages/third.js
index c55c4f85d0c912..89d07047078604 100644
--- a/test/integration/invalid-href/pages/third.js
+++ b/test/integration/invalid-href/pages/third.js
@@ -3,8 +3,8 @@ const invalidLink = 'https://'
 
 export default function Page() {
   return (
-    <Link href={invalidLink}>
-      <a id="click-me">invalid link :o</a>
+    <Link href={invalidLink} id="click-me">
+      invalid link :o
     </Link>
   )
 }
diff --git a/test/integration/link-ref/pages/child-ref-func.js b/test/integration/link-ref/pages/child-ref-func.js
index 7588a1ff1626a6..6db30753392963 100644
--- a/test/integration/link-ref/pages/child-ref-func.js
+++ b/test/integration/link-ref/pages/child-ref-func.js
@@ -11,14 +11,13 @@ export default () => {
   })
 
   return (
-    <Link href="/">
-      <a
-        ref={(el) => {
-          myRef.current = el
-        }}
-      >
-        Click me
-      </a>
+    <Link
+      href="/"
+      ref={(el) => {
+        myRef.current = el
+      }}
+    >
+      Click me
     </Link>
   )
 }
diff --git a/test/integration/link-ref/pages/child-ref.js b/test/integration/link-ref/pages/child-ref.js
index 8aa5c481b1847b..bdd21767f714fa 100644
--- a/test/integration/link-ref/pages/child-ref.js
+++ b/test/integration/link-ref/pages/child-ref.js
@@ -11,8 +11,8 @@ export default () => {
   })
 
   return (
-    <Link href="/">
-      <a ref={myRef}>Click me</a>
+    <Link href="/" ref={myRef}>
+      Click me
     </Link>
   )
 }
diff --git a/test/integration/link-ref/pages/class.js b/test/integration/link-ref/pages/class.js
index 3c0968cdd51336..8706137030fd04 100644
--- a/test/integration/link-ref/pages/class.js
+++ b/test/integration/link-ref/pages/class.js
@@ -8,7 +8,7 @@ class MyLink extends React.Component {
 }
 
 export default () => (
-  <Link href="/" passHref>
+  <Link href="/" passHref legacyBehavior>
     <MyLink />
   </Link>
 )
diff --git a/test/integration/link-ref/pages/function.js b/test/integration/link-ref/pages/function.js
index aacb747b207fd9..f8a11333b6a4e9 100644
--- a/test/integration/link-ref/pages/function.js
+++ b/test/integration/link-ref/pages/function.js
@@ -8,7 +8,7 @@ const MyLink = React.forwardRef((props, ref) => (
 ))
 
 export default () => (
-  <Link href="/" passHref>
+  <Link href="/" passHref legacyBehavior>
     <MyLink />
   </Link>
 )
diff --git a/test/integration/link-with-encoding/pages/index.js b/test/integration/link-with-encoding/pages/index.js
index 198f89935a4892..88dd8ff9a0d0d4 100644
--- a/test/integration/link-with-encoding/pages/index.js
+++ b/test/integration/link-with-encoding/pages/index.js
@@ -2,37 +2,48 @@ import Link from 'next/link'
 
 const Home = () => (
   <div>
-    <Link href="/single/[slug]" as={encodeURI('/single/hello world ')}>
-      <a id="single-spaces">Single: Spaces</a>
+    <Link
+      href="/single/[slug]"
+      as={encodeURI('/single/hello world ')}
+      id="single-spaces"
+    >
+      Single: Spaces
     </Link>
     <br />
-    <Link href="/single/[slug]" as={encodeURI('/single/hello%world')}>
-      <a id="single-percent">Single: Percent</a>
+    <Link
+      href="/single/[slug]"
+      as={encodeURI('/single/hello%world')}
+      id="single-percent"
+    >
+      Single: Percent
     </Link>
     <br />
     <Link
       href="/single/[slug]"
       as={`/single/hello${encodeURIComponent('/')}world`}
+      id="single-slash"
     >
-      <a id="single-slash">Single: Forward Slash</a>
+      Single: Forward Slash
     </Link>
     <br />
     <Link
       href="/single/[slug]"
       as={`/single/hello${encodeURIComponent('"')}world`}
+      id="single-double-quote"
     >
-      <a id="single-double-quote">Single: "</a>
+      Single: "
     </Link>
     <br />
     <Link
       href="/single/[slug]"
       as={`/single/hello${encodeURIComponent(':')}world`}
+      id="single-colon"
     >
-      <a id="single-colon">Single: :</a>
+      Single: :
     </Link>
     <br />
-    <Link href="/query?id=http://example.com/">
-      <a id="url-param">Url query param</a>
+    <Link href="/query?id=http://example.com/" id="url-param">
+      Url query param
     </Link>
   </div>
 )
diff --git a/test/integration/link-without-router/components/hello.js b/test/integration/link-without-router/components/hello.js
index 466ff9edccbe73..36f2bc001eb1ea 100644
--- a/test/integration/link-without-router/components/hello.js
+++ b/test/integration/link-without-router/components/hello.js
@@ -2,9 +2,5 @@ import React from 'react'
 import Link from 'next/link'
 
 export default function Hello() {
-  return (
-    <Link href="/">
-      <a>Click me</a>
-    </Link>
-  )
+  return <Link href="/">Click me</Link>
 }
diff --git a/test/integration/middleware-prefetch/pages/index.js b/test/integration/middleware-prefetch/pages/index.js
index cef09905882616..80184bb7ed8fa5 100644
--- a/test/integration/middleware-prefetch/pages/index.js
+++ b/test/integration/middleware-prefetch/pages/index.js
@@ -5,12 +5,12 @@ export default function Home() {
     <div>
       <p>Home Page</p>
       <div />
-      <Link href="/made-up">
-        <a id="made-up-link">Madeup Page</a>
+      <Link href="/made-up" id="made-up-link">
+        Madeup Page
       </Link>
       <div />
-      <Link href="/ssg-page-2">
-        <a id="ssg-page-2">SSG Page 2 (Redirect)</a>
+      <Link href="/ssg-page-2" id="ssg-page-2">
+        SSG Page 2 (Redirect)
       </Link>
       <div />
     </div>
diff --git a/test/integration/next-image-legacy/basic/pages/client-side.js b/test/integration/next-image-legacy/basic/pages/client-side.js
index b8a0e980821b6f..619199b64b262c 100644
--- a/test/integration/next-image-legacy/basic/pages/client-side.js
+++ b/test/integration/next-image-legacy/basic/pages/client-side.js
@@ -88,8 +88,8 @@ const ClientSide = () => {
         width={300}
         height={300}
       />
-      <Link href="/errors">
-        <a id="errorslink">Errors</a>
+      <Link href="/errors" id="errorslink">
+        Errors
       </Link>
     </div>
   )
diff --git a/test/integration/next-image-legacy/basic/pages/index.js b/test/integration/next-image-legacy/basic/pages/index.js
index cf9b112f7f907a..a0edc5cd0e00ab 100644
--- a/test/integration/next-image-legacy/basic/pages/index.js
+++ b/test/integration/next-image-legacy/basic/pages/index.js
@@ -113,11 +113,11 @@ const Page = () => {
         width={300}
         height={300}
       />
-      <Link href="/client-side">
-        <a id="clientlink">Client Side</a>
+      <Link href="/client-side" id="clientlink">
+        Client Side
       </Link>
-      <Link href="/lazy">
-        <a id="lazylink">lazy</a>
+      <Link href="/lazy" id="lazylink">
+        lazy
       </Link>
       <Head>
         <link rel="stylesheet" href="styles.css" />
diff --git a/test/integration/next-image-legacy/custom-resolver/pages/index.js b/test/integration/next-image-legacy/custom-resolver/pages/index.js
index 09308230f8b8d0..c01664570a978d 100644
--- a/test/integration/next-image-legacy/custom-resolver/pages/index.js
+++ b/test/integration/next-image-legacy/custom-resolver/pages/index.js
@@ -30,8 +30,8 @@ const Page = () => {
         width={300}
         height={400}
       />
-      <Link href="/client-side">
-        <a id="clientlink">Client Side</a>
+      <Link href="/client-side" id="clientlink">
+        Client Side
       </Link>
     </div>
   )
diff --git a/test/integration/next-image-legacy/no-intersection-observer-fallback/pages/index.js b/test/integration/next-image-legacy/no-intersection-observer-fallback/pages/index.js
index 1f93fe81ed2764..9af0db93ad1a62 100644
--- a/test/integration/next-image-legacy/no-intersection-observer-fallback/pages/index.js
+++ b/test/integration/next-image-legacy/no-intersection-observer-fallback/pages/index.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 const About = () => {
   return (
     <div>
-      <Link href="/no-observer">
-        <a id="link-no-observer">Test No IntersectionObserver</a>
+      <Link href="/no-observer" id="link-no-observer">
+        Test No IntersectionObserver
       </Link>
     </div>
   )
diff --git a/test/integration/no-page-props/pages/index.js b/test/integration/no-page-props/pages/index.js
index eab144bd52f4b2..faabfa37142a6d 100644
--- a/test/integration/no-page-props/pages/index.js
+++ b/test/integration/no-page-props/pages/index.js
@@ -4,16 +4,16 @@ export default function Index() {
   return (
     <>
       <p id="index">index</p>
-      <Link href="/gsp">
-        <a id="to-gsp">to gsp</a>
+      <Link href="/gsp" id="to-gsp">
+        to gsp
       </Link>
       <br />
-      <Link href="/gssp">
-        <a id="to-gssp">to gssp</a>
+      <Link href="/gssp" id="to-gssp">
+        to gssp
       </Link>
       <br />
-      <Link href="/non-existent">
-        <a id="to-404">to non-existent</a>
+      <Link href="/non-existent" id="to-404">
+        to non-existent
       </Link>
       <br />
     </>
diff --git a/test/integration/ondemand/pages/index.js b/test/integration/ondemand/pages/index.js
index d4792b71fc294b..bf1f0bfb660d98 100644
--- a/test/integration/ondemand/pages/index.js
+++ b/test/integration/ondemand/pages/index.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 export default () => (
   <div>
     <p>Index Page</p>
-    <Link href="/about">
-      <a id="about-link">About Page</a>
+    <Link href="/about" id="about-link">
+      About Page
     </Link>
   </div>
 )
diff --git a/test/integration/ondemand/pages/nav/index.js b/test/integration/ondemand/pages/nav/index.js
index 4e632ab1efd421..975fcad6773684 100644
--- a/test/integration/ondemand/pages/nav/index.js
+++ b/test/integration/ondemand/pages/nav/index.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export default () => (
   <div>
-    <Link href="/nav/dynamic">
-      <a id="to-dynamic">To dynamic import</a>
+    <Link href="/nav/dynamic" id="to-dynamic">
+      To dynamic import
     </Link>
   </div>
 )
diff --git a/test/integration/preload-viewport/pages/bot-user-agent.js b/test/integration/preload-viewport/pages/bot-user-agent.js
index aa524d95585096..ffd12f920a0b84 100644
--- a/test/integration/preload-viewport/pages/bot-user-agent.js
+++ b/test/integration/preload-viewport/pages/bot-user-agent.js
@@ -14,8 +14,8 @@ export default () => {
         ></script>
       </Head>
       <br />
-      <Link href="/another">
-        <a id="link-another">to /another</a>
+      <Link href="/another" id="link-another">
+        to /another
       </Link>
     </div>
   )
diff --git a/test/integration/preload-viewport/pages/de-duped.js b/test/integration/preload-viewport/pages/de-duped.js
index 1f18d6d87f6ffe..88f95059cf28ba 100644
--- a/test/integration/preload-viewport/pages/de-duped.js
+++ b/test/integration/preload-viewport/pages/de-duped.js
@@ -3,9 +3,7 @@ import Link from 'next/link'
 export default () => {
   return (
     <p>
-      <Link href="/first">
-        <a>to /first</a>
-      </Link>
+      <Link href="/first">to /first</Link>
     </p>
   )
 }
diff --git a/test/integration/preload-viewport/pages/index.js b/test/integration/preload-viewport/pages/index.js
index a0cb7a920dfc70..c8c8a7e3ad1c47 100644
--- a/test/integration/preload-viewport/pages/index.js
+++ b/test/integration/preload-viewport/pages/index.js
@@ -10,9 +10,7 @@ export default () => {
         Scroll to another
       </a>
       <button onClick={() => setHref('/another')}>Click me</button>
-      <Link href={href}>
-        <a>to {href}</a>
-      </Link>
+      <Link href={href}>to{href}</Link>
       <div
         style={{
           height: 10000,
@@ -21,8 +19,8 @@ export default () => {
         }}
       />
       <p id="scroll-to-me">Hi 👋</p>
-      <Link href="/another">
-        <a id="link-another">to /another</a>
+      <Link href="/another" id="link-another">
+        to /another
       </Link>
     </div>
   )
diff --git a/test/integration/preload-viewport/pages/invalid-prefetch.js b/test/integration/preload-viewport/pages/invalid-prefetch.js
index c4b7d284fb5e4d..0e2970410e254a 100644
--- a/test/integration/preload-viewport/pages/invalid-prefetch.js
+++ b/test/integration/preload-viewport/pages/invalid-prefetch.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export default () => (
   <>
-    <Link href="/something-invalid-oops">
-      <a id="invalid-link">I'm broken…</a>
+    <Link href="/something-invalid-oops" id="invalid-link">
+      I'm broken…
     </Link>
   </>
 )
diff --git a/test/integration/preload-viewport/pages/invalid-ref.js b/test/integration/preload-viewport/pages/invalid-ref.js
index 4eb2b5ba563c6e..fbd92fb2343b43 100644
--- a/test/integration/preload-viewport/pages/invalid-ref.js
+++ b/test/integration/preload-viewport/pages/invalid-ref.js
@@ -9,7 +9,7 @@ class Button extends React.Component {
 
 export default () => (
   <div>
-    <Link href="/another" passHref>
+    <Link href="/another" passHref legacyBehavior>
       <Button id="btn-link" />
     </Link>
   </div>
diff --git a/test/integration/preload-viewport/pages/multi-prefetch.js b/test/integration/preload-viewport/pages/multi-prefetch.js
index 9d03878008c0d5..493da554ea6bf6 100644
--- a/test/integration/preload-viewport/pages/multi-prefetch.js
+++ b/test/integration/preload-viewport/pages/multi-prefetch.js
@@ -16,7 +16,7 @@ export default () => {
   return (
     <div>
       <Link prefetch={true} href="/dynamic/[hello]" as={'/dynamic/test'}>
-        <a>I should only be prefetched once</a>
+        I should only be prefetched once
       </Link>
     </div>
   )
diff --git a/test/integration/preload-viewport/pages/not-de-duped.js b/test/integration/preload-viewport/pages/not-de-duped.js
index c8b164baeb8fb5..ad53e59cc037d2 100644
--- a/test/integration/preload-viewport/pages/not-de-duped.js
+++ b/test/integration/preload-viewport/pages/not-de-duped.js
@@ -4,7 +4,7 @@ export default () => {
   return (
     <p>
       <Link href="/first" as="/first#different">
-        <a>to /first</a>
+        to /first
       </Link>
     </p>
   )
diff --git a/test/integration/preload-viewport/pages/opt-out.js b/test/integration/preload-viewport/pages/opt-out.js
index 0ee371b4288f70..1edb6290bc4a0f 100644
--- a/test/integration/preload-viewport/pages/opt-out.js
+++ b/test/integration/preload-viewport/pages/opt-out.js
@@ -3,7 +3,7 @@ import Link from 'next/link'
 export default () => (
   <div>
     <Link prefetch={false} href="/another">
-      <a>I'm not pre-fetched..</a>
+      I'm not pre-fetched..
     </Link>
   </div>
 )
diff --git a/test/integration/preload-viewport/pages/prefetch-disabled-ssg.js b/test/integration/preload-viewport/pages/prefetch-disabled-ssg.js
index 385a06918bc9b3..5d1a6c2ec3820e 100644
--- a/test/integration/preload-viewport/pages/prefetch-disabled-ssg.js
+++ b/test/integration/preload-viewport/pages/prefetch-disabled-ssg.js
@@ -4,8 +4,8 @@ export default () => {
   return (
     <div>
       <br />
-      <Link href="/ssg/basic" prefetch={false}>
-        <a id="link-ssg">to /ssg/basic</a>
+      <Link href="/ssg/basic" prefetch={false} id="link-ssg">
+        to /ssg/basic
       </Link>
     </div>
   )
diff --git a/test/integration/preload-viewport/pages/prefetch-disabled.js b/test/integration/preload-viewport/pages/prefetch-disabled.js
index e5a95c546c6f3d..ea716cff648406 100644
--- a/test/integration/preload-viewport/pages/prefetch-disabled.js
+++ b/test/integration/preload-viewport/pages/prefetch-disabled.js
@@ -4,8 +4,8 @@ export default () => {
   return (
     <div>
       <br />
-      <Link href="/another" prefetch={false}>
-        <a id="link-another">to /another</a>
+      <Link href="/another" prefetch={false} id="link-another">
+        to /another
       </Link>
     </div>
   )
diff --git a/test/integration/preload-viewport/pages/rewrite-prefetch.js b/test/integration/preload-viewport/pages/rewrite-prefetch.js
index 122635f668cd3e..aea8c416474961 100644
--- a/test/integration/preload-viewport/pages/rewrite-prefetch.js
+++ b/test/integration/preload-viewport/pages/rewrite-prefetch.js
@@ -1,9 +1,5 @@
 import Link from 'next/link'
 
 export default function Page() {
-  return (
-    <Link href="/rewrite-me">
-      <a>to /rewrite-me</a>
-    </Link>
-  )
+  return <Link href="/rewrite-me">to /rewrite-me</Link>
 }
diff --git a/test/integration/preload-viewport/pages/ssg/fixture/index.js b/test/integration/preload-viewport/pages/ssg/fixture/index.js
index 3714af1f9e7d9b..4ebdab12740f03 100644
--- a/test/integration/preload-viewport/pages/ssg/fixture/index.js
+++ b/test/integration/preload-viewport/pages/ssg/fixture/index.js
@@ -4,19 +4,17 @@ export default () => (
   <main>
     <h1>SSG Data Prefetch Fixtures</h1>
     <p>
-      <Link href="/ssg/basic">
-        <a>Non-dynamic route</a>
-      </Link>
-      : this is a normal Next.js page that does not use dynamic routing.
+      <Link href="/ssg/basic">Non-dynamic route</Link>: this is a normal Next.js
+      page that does not use dynamic routing.
     </p>
     <p>
       <Link href="/ssg/dynamic/[slug]" as="/ssg/dynamic/one">
-        <a>Dynamic Route (one level) — Prerendered</a>
+        Dynamic Route (one level) — Prerendered
       </Link>
       : this is a Dynamic Page with a single dynamic segment that{' '}
       <strong>was returned</strong> from <code>getStaticPaths</code>.<br />
       <Link href="/ssg/dynamic/[slug]" as="/ssg/dynamic/two">
-        <a>Dynamic Route (one level) — Not Prerendered</a>
+        Dynamic Route (one level) — Not Prerendered
       </Link>
       : this is a Dynamic Page with a single dynamic segment that{' '}
       <strong>was not returned</strong> from <code>getStaticPaths</code>.
@@ -26,7 +24,7 @@ export default () => (
         href="/ssg/dynamic-nested/[slug1]/[slug2]"
         as="/ssg/dynamic-nested/one/two"
       >
-        <a>Multi Dynamic Route (two levels) — Prerendered</a>
+        Multi Dynamic Route (two levels) — Prerendered
       </Link>
       : this is a Dynamic Page with two dynamic segments that{' '}
       <strong>were returned</strong> from <code>getStaticPaths</code>.<br />
@@ -34,29 +32,29 @@ export default () => (
         href="/ssg/dynamic-nested/[slug1]/[slug2]"
         as="/ssg/dynamic-nested/foo/bar"
       >
-        <a>Multi Dynamic Route (two levels) — Not Prerendered</a>
+        Multi Dynamic Route (two levels) — Not Prerendered
       </Link>
       : this is a Dynamic Page with two dynamic segments that{' '}
       <strong>were not returned</strong> from <code>getStaticPaths</code>.
     </p>
     <p>
       <Link href="/ssg/catch-all/[...slug]" as="/ssg/catch-all/one">
-        <a>Catch-All Route (one level) — Prerendered</a>
+        Catch-All Route (one level) — Prerendered
       </Link>
       : this is a Catch-All Page with one segment that{' '}
       <strong>was returned</strong> from <code>getStaticPaths</code>.<br />
       <Link href="/ssg/catch-all/[...slug]" as="/ssg/catch-all/foo">
-        <a>Catch-All Route (one level) — Not Prerendered</a>
+        Catch-All Route (one level) — Not Prerendered
       </Link>
       : this is a Catch-All Page with one segment that{' '}
       <strong>was not returned</strong> from <code>getStaticPaths</code>.<br />
       <Link href="/ssg/catch-all/[...slug]" as="/ssg/catch-all/one/two">
-        <a>Catch-All Route (two levels) — Prerendered</a>
+        Catch-All Route (two levels) — Prerendered
       </Link>
       : this is a Catch-All Page with two segments that{' '}
       <strong>were returned</strong> from <code>getStaticPaths</code>.<br />
       <Link href="/ssg/catch-all/[...slug]" as="/ssg/catch-all/foo/bar">
-        <a>Catch-All Route (two levels) — Not Prerendered</a>
+        Catch-All Route (two levels) — Not Prerendered
       </Link>
       : this is a Catch-All Page with two segments that{' '}
       <strong>were not returned</strong> from <code>getStaticPaths</code>.
diff --git a/test/integration/preload-viewport/pages/ssg/fixture/mismatch.js b/test/integration/preload-viewport/pages/ssg/fixture/mismatch.js
index 7d0dcb57eb1b20..1805ea398c6dc4 100644
--- a/test/integration/preload-viewport/pages/ssg/fixture/mismatch.js
+++ b/test/integration/preload-viewport/pages/ssg/fixture/mismatch.js
@@ -5,12 +5,12 @@ export default () => (
     <h1>Mismatched SSG Data Prefetch Fixtures</h1>
     <p>
       <Link href="/ssg/dynamic/[slug]?slug=one" as="/ssg/fixture/mismatch">
-        <a>Dynamic Route (one level) — Prerendered</a>
+        Dynamic Route (one level) — Prerendered
       </Link>
       : this is a Dynamic Page with a single dynamic segment that{' '}
       <strong>was returned</strong> from <code>getStaticPaths</code>.<br />
       <Link href="/ssg/dynamic/[slug]?slug=two" as="/ssg/fixture/mismatch">
-        <a>Dynamic Route (one level) — Not Prerendered</a>
+        Dynamic Route (one level) — Not Prerendered
       </Link>
       : this is a Dynamic Page with a single dynamic segment that{' '}
       <strong>was not returned</strong> from <code>getStaticPaths</code>.
@@ -23,7 +23,7 @@ export default () => (
         }}
         as="/ssg/fixture/mismatch"
       >
-        <a>Multi Dynamic Route (two levels) — Prerendered</a>
+        Multi Dynamic Route (two levels) — Prerendered
       </Link>
       : this is a Dynamic Page with two dynamic segments that{' '}
       <strong>were returned</strong> from <code>getStaticPaths</code>.<br />
@@ -34,7 +34,7 @@ export default () => (
         }}
         as="/ssg/fixture/mismatch"
       >
-        <a>Multi Dynamic Route (two levels) — Not Prerendered</a>
+        Multi Dynamic Route (two levels) — Not Prerendered
       </Link>
       : this is a Dynamic Page with two dynamic segments that{' '}
       <strong>were not returned</strong> from <code>getStaticPaths</code>.
@@ -47,7 +47,7 @@ export default () => (
         }}
         as="/ssg/fixture/mismatch"
       >
-        <a>Catch-All Route (one level) — Prerendered</a>
+        Catch-All Route (one level) — Prerendered
       </Link>
       : this is a Catch-All Page with one segment that{' '}
       <strong>was returned</strong> from <code>getStaticPaths</code>.<br />
@@ -58,7 +58,7 @@ export default () => (
         }}
         as="/ssg/fixture/mismatch"
       >
-        <a>Catch-All Route (one level) — Not Prerendered</a>
+        Catch-All Route (one level) — Not Prerendered
       </Link>
       : this is a Catch-All Page with one segment that{' '}
       <strong>was not returned</strong> from <code>getStaticPaths</code>.<br />
@@ -69,7 +69,7 @@ export default () => (
         }}
         as="/ssg/fixture/mismatch"
       >
-        <a>Catch-All Route (two levels) — Prerendered</a>
+        Catch-All Route (two levels) — Prerendered
       </Link>
       : this is a Catch-All Page with two segments that{' '}
       <strong>were returned</strong> from <code>getStaticPaths</code>.<br />
@@ -80,7 +80,7 @@ export default () => (
         }}
         as="/ssg/fixture/mismatch"
       >
-        <a>Catch-All Route (two levels) — Not Prerendered</a>
+        Catch-All Route (two levels) — Not Prerendered
       </Link>
       : this is a Catch-All Page with two segments that{' '}
       <strong>were not returned</strong> from <code>getStaticPaths</code>.
diff --git a/test/integration/prerender-preview/pages/to-index.js b/test/integration/prerender-preview/pages/to-index.js
index 306ead7496d801..5717b1ea2f7c6a 100644
--- a/test/integration/prerender-preview/pages/to-index.js
+++ b/test/integration/prerender-preview/pages/to-index.js
@@ -7,8 +7,8 @@ export function getStaticProps() {
 export default function () {
   return (
     <main>
-      <Link href="/">
-        <a id="to-index">To Index</a>
+      <Link href="/" id="to-index">
+        To Index
       </Link>
     </main>
   )
diff --git a/test/integration/prerender/pages/another/index.js b/test/integration/prerender/pages/another/index.js
index 1504f1edb48441..ab4b9a0fd4287d 100644
--- a/test/integration/prerender/pages/another/index.js
+++ b/test/integration/prerender/pages/another/index.js
@@ -19,12 +19,12 @@ export default ({ world, time }) => (
   <>
     <p>hello {world}</p>
     <span id="anotherTime">time: {time}</span>
-    <Link href="/">
-      <a id="home">to home</a>
+    <Link href="/" id="home">
+      to home
     </Link>
     <br />
-    <Link href="/something">
-      <a id="something">to something</a>
+    <Link href="/something" id="something">
+      to something
     </Link>
   </>
 )
diff --git a/test/integration/prerender/pages/blocking-fallback-once/[slug].js b/test/integration/prerender/pages/blocking-fallback-once/[slug].js
index 5b047ded890c0c..dd5dbb97d370d0 100644
--- a/test/integration/prerender/pages/blocking-fallback-once/[slug].js
+++ b/test/integration/prerender/pages/blocking-fallback-once/[slug].js
@@ -35,8 +35,8 @@ export default ({ post, time, params }) => {
       <span>time: {time}</span>
       <div id="params">{JSON.stringify(params)}</div>
       <div id="query">{JSON.stringify(useRouter().query)}</div>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/integration/prerender/pages/blocking-fallback-some/[slug].js b/test/integration/prerender/pages/blocking-fallback-some/[slug].js
index dc89af7f5117e4..4536a8fd565800 100644
--- a/test/integration/prerender/pages/blocking-fallback-some/[slug].js
+++ b/test/integration/prerender/pages/blocking-fallback-some/[slug].js
@@ -35,8 +35,8 @@ export default ({ post, time, params }) => {
       <span>time: {time}</span>
       <div id="params">{JSON.stringify(params)}</div>
       <div id="query">{JSON.stringify(useRouter().query)}</div>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/integration/prerender/pages/blocking-fallback/[slug].js b/test/integration/prerender/pages/blocking-fallback/[slug].js
index 0b39f579352ca6..291a27b6c99185 100644
--- a/test/integration/prerender/pages/blocking-fallback/[slug].js
+++ b/test/integration/prerender/pages/blocking-fallback/[slug].js
@@ -35,8 +35,8 @@ export default ({ post, time, params }) => {
       <span>time: {time}</span>
       <div id="params">{JSON.stringify(params)}</div>
       <div id="query">{JSON.stringify(useRouter().query)}</div>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/integration/prerender/pages/blog/[post]/[comment].js b/test/integration/prerender/pages/blog/[post]/[comment].js
index 39ee2d9afce5b8..49298a4049a9c2 100644
--- a/test/integration/prerender/pages/blog/[post]/[comment].js
+++ b/test/integration/prerender/pages/blog/[post]/[comment].js
@@ -33,8 +33,8 @@ export default ({ post, comment, time }) => {
       <p>Post: {post}</p>
       <p>Comment: {comment}</p>
       <span>time: {time}</span>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/integration/prerender/pages/blog/[post]/index.js b/test/integration/prerender/pages/blog/[post]/index.js
index 6f0e3c0ea101e2..85456078750614 100644
--- a/test/integration/prerender/pages/blog/[post]/index.js
+++ b/test/integration/prerender/pages/blog/[post]/index.js
@@ -53,8 +53,8 @@ export default ({ post, time, params }) => {
       <span>time: {time}</span>
       <div id="params">{JSON.stringify(params)}</div>
       <div id="query">{JSON.stringify(useRouter().query)}</div>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/integration/prerender/pages/blog/index.js b/test/integration/prerender/pages/blog/index.js
index 71ba9e9b1cca01..02907102696854 100644
--- a/test/integration/prerender/pages/blog/index.js
+++ b/test/integration/prerender/pages/blog/index.js
@@ -16,8 +16,8 @@ export default ({ slugs, time }) => {
     <>
       <p>Posts: {JSON.stringify(slugs)}</p>
       <span>time: {time}</span>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/integration/prerender/pages/catchall-explicit/[...slug].js b/test/integration/prerender/pages/catchall-explicit/[...slug].js
index dcdd57e35e5701..9c0d2ebf1811ae 100644
--- a/test/integration/prerender/pages/catchall-explicit/[...slug].js
+++ b/test/integration/prerender/pages/catchall-explicit/[...slug].js
@@ -33,8 +33,8 @@ export default function Page({ slug }) {
   return (
     <>
       <p id="catchall">Hi {slug.join(' ')}</p>{' '}
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/integration/prerender/pages/catchall-optional/[[...slug]].js b/test/integration/prerender/pages/catchall-optional/[[...slug]].js
index 2e613944725c99..a3342e4684a3c4 100644
--- a/test/integration/prerender/pages/catchall-optional/[[...slug]].js
+++ b/test/integration/prerender/pages/catchall-optional/[[...slug]].js
@@ -21,8 +21,8 @@ export default ({ slug }) => {
   return (
     <>
       <p id="catchall">Catch all: [{slug.join(', ')}]</p>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/integration/prerender/pages/default-revalidate.js b/test/integration/prerender/pages/default-revalidate.js
index 68570ca0ba7233..a044bc159750d3 100644
--- a/test/integration/prerender/pages/default-revalidate.js
+++ b/test/integration/prerender/pages/default-revalidate.js
@@ -13,12 +13,12 @@ export default ({ world, time }) => (
   <>
     <p>hello {world}</p>
     <span>time: {time}</span>
-    <Link href="/">
-      <a id="home">to home</a>
+    <Link href="/" id="home">
+      to home
     </Link>
     <br />
-    <Link href="/something">
-      <a id="something">to something</a>
+    <Link href="/something" id="something">
+      to something
     </Link>
   </>
 )
diff --git a/test/integration/prerender/pages/dynamic/[slug].js b/test/integration/prerender/pages/dynamic/[slug].js
index 67876322003a91..e6eeea77f3c104 100644
--- a/test/integration/prerender/pages/dynamic/[slug].js
+++ b/test/integration/prerender/pages/dynamic/[slug].js
@@ -19,8 +19,8 @@ export default ({ slug }) => {
   return (
     <>
       <p id="param">Hi {slug}!</p>{' '}
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/integration/prerender/pages/fallback-only/[slug].js b/test/integration/prerender/pages/fallback-only/[slug].js
index dbb44ed06ce693..57172c74ae22b9 100644
--- a/test/integration/prerender/pages/fallback-only/[slug].js
+++ b/test/integration/prerender/pages/fallback-only/[slug].js
@@ -35,8 +35,8 @@ export default ({ post, time, params }) => {
       <span>time: {time}</span>
       <div id="params">{JSON.stringify(params)}</div>
       <div id="query">{JSON.stringify(useRouter().query)}</div>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/integration/prerender/pages/index.js b/test/integration/prerender/pages/index.js
index 063d1a7941d87b..a28d2e6bbaa6a1 100644
--- a/test/integration/prerender/pages/index.js
+++ b/test/integration/prerender/pages/index.js
@@ -15,76 +15,91 @@ const Page = ({ world, time }) => {
       {/* <div id='after-change'>idk</div> */}
       <p>hello {world}</p>
       <span>time: {time}</span>
-      <Link href="/non-json/[p]" as="/non-json/1">
-        <a id="non-json">to non-json</a>
+      <Link href="/non-json/[p]" as="/non-json/1" id="non-json">
+        to non-json
       </Link>
       <br />
-      <Link href="/another?hello=world" as="/another/?hello=world">
-        <a id="another">to another</a>
+      <Link href="/another?hello=world" as="/another/?hello=world" id="another">
+        to another
       </Link>
       <br />
-      <Link href="/something">
-        <a id="something">to something</a>
+      <Link href="/something" id="something">
+        to something
       </Link>
       <br />
-      <Link href="/normal">
-        <a id="normal">to normal</a>
+      <Link href="/normal" id="normal">
+        to normal
       </Link>
       <br />
-      <Link href="/blog/[post]" as="/blog/post-1">
-        <a id="post-1">to dynamic</a>
+      <Link href="/blog/[post]" as="/blog/post-1" id="post-1">
+        to dynamic
       </Link>
-      <Link href="/blog/[post]" as="/blog/post-100">
-        <a id="broken-post">to broken</a>
+      <Link href="/blog/[post]" as="/blog/post-100" id="broken-post">
+        to broken
       </Link>
-      <Link href="/blog/[post]" as="/blog/post-999" prefetch={false}>
-        <a id="broken-at-first-post">to broken at first</a>
+      <Link
+        href="/blog/[post]"
+        as="/blog/post-999"
+        prefetch={false}
+        id="broken-at-first-post"
+      >
+        to broken at first
       </Link>
       <br />
-      <Link href="/blog/[post]/[comment]" as="/blog/post-1/comment-1">
-        <a id="comment-1">to another dynamic</a>
+      <Link
+        href="/blog/[post]/[comment]"
+        as="/blog/post-1/comment-1"
+        id="comment-1"
+      >
+        to another dynamic
       </Link>
-      <Link href="/catchall/[...slug]" as="/catchall/first">
-        <a id="to-catchall">to catchall</a>
+      <Link href="/catchall/[...slug]" as="/catchall/first" id="to-catchall">
+        to catchall
       </Link>
       <br />
-      <Link href="/index">
-        <a id="to-nested-index">to nested index</a>
+      <Link href="/index" id="to-nested-index">
+        to nested index
       </Link>
       <br />
-      <Link href="/lang/[lang]/about?lang=en" as="/about">
-        <a id="to-rewritten-ssg">to rewritten static path page</a>
+      <Link href="/lang/[lang]/about?lang=en" as="/about" id="to-rewritten-ssg">
+        to rewritten static path page
       </Link>
       <br />
-      <Link href="/catchall-optional/[[...slug]]" as="/catchall-optional">
-        <a id="catchall-optional-root">to optional catchall root</a>
+      <Link
+        href="/catchall-optional/[[...slug]]"
+        as="/catchall-optional"
+        id="catchall-optional-root"
+      >
+        to optional catchall root
       </Link>
-      <Link href="/catchall-optional/[[...slug]]" as="/catchall-optional/value">
-        <a id="catchall-optional-value">to optional catchall page /value</a>
+      <Link
+        href="/catchall-optional/[[...slug]]"
+        as="/catchall-optional/value"
+        id="catchall-optional-value"
+      >
+        to optional catchall page /value
       </Link>
       <br />
-      <Link href="/dynamic/[slug]" as="/dynamic/[first]">
-        <a id="dynamic-first">to dynamic [first] page</a>
+      <Link href="/dynamic/[slug]" as="/dynamic/[first]" id="dynamic-first">
+        to dynamic [first] page
       </Link>
-      <Link href="/dynamic/[slug]" as="/dynamic/[second]">
-        <a id="dynamic-second">to dynamic [second] page</a>
+      <Link href="/dynamic/[slug]" as="/dynamic/[second]" id="dynamic-second">
+        to dynamic [second] page
       </Link>
       <br />
       <Link
         href="/catchall-explicit/[...slug]"
         as="/catchall-explicit/[first]/[second]"
+        id="catchall-explicit-string"
       >
-        <a id="catchall-explicit-string">
-          to catchall-explicit [first]/[second] page
-        </a>
+        to catchall-explicit [first]/[second] page
       </Link>
       <Link
         href="/catchall-explicit/[...slug]"
         as="/catchall-explicit/[third]/[fourth]"
+        id="catchall-explicit-object"
       >
-        <a id="catchall-explicit-object">
-          to catchall-explicit [third]/[fourth] page
-        </a>
+        to catchall-explicit [third]/[fourth] page
       </Link>
     </>
   )
diff --git a/test/integration/prerender/pages/index/index.js b/test/integration/prerender/pages/index/index.js
index 99eb2429398170..e934eb292db2e9 100644
--- a/test/integration/prerender/pages/index/index.js
+++ b/test/integration/prerender/pages/index/index.js
@@ -10,8 +10,8 @@ export default ({ world }) => {
   return (
     <>
       <p>hello {world}</p>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/integration/prerender/pages/something.js b/test/integration/prerender/pages/something.js
index 180818998c8d82..d143af67a537cd 100644
--- a/test/integration/prerender/pages/something.js
+++ b/test/integration/prerender/pages/something.js
@@ -22,12 +22,12 @@ export default ({ world, time, params, random }) => {
       <div id="random">{random}</div>
       <div id="params">{JSON.stringify(params)}</div>
       <div id="query">{JSON.stringify(useRouter().query)}</div>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
       <br />
-      <Link href="/another">
-        <a id="another">to another</a>
+      <Link href="/another" id="another">
+        to another
       </Link>
     </>
   )
diff --git a/test/integration/prerender/pages/user/[user]/profile.js b/test/integration/prerender/pages/user/[user]/profile.js
index 95bf6e7ad7b0da..f6fde9e610b22c 100644
--- a/test/integration/prerender/pages/user/[user]/profile.js
+++ b/test/integration/prerender/pages/user/[user]/profile.js
@@ -20,8 +20,8 @@ export default ({ user, time }) => {
     <>
       <p>User: {user}</p>
       <span>time: {time}</span>
-      <Link href="/">
-        <a id="home">to home</a>
+      <Link href="/" id="home">
+        to home
       </Link>
     </>
   )
diff --git a/test/integration/production-nav/pages/another.js b/test/integration/production-nav/pages/another.js
index d027b27d1f4330..6c18e28dc1af11 100644
--- a/test/integration/production-nav/pages/another.js
+++ b/test/integration/production-nav/pages/another.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export default () => (
   <>
-    <Link href="/">
-      <a id="to-index">Index</a>
+    <Link href="/" id="to-index">
+      Index
     </Link>
   </>
 )
diff --git a/test/integration/production-nav/pages/index.js b/test/integration/production-nav/pages/index.js
index 3730194ebce163..7b4fde0160e3f0 100644
--- a/test/integration/production-nav/pages/index.js
+++ b/test/integration/production-nav/pages/index.js
@@ -2,8 +2,8 @@ import Link from 'next/link'
 
 export default () => (
   <>
-    <Link href="/another">
-      <a id="to-another">Another</a>
+    <Link href="/another" id="to-another">
+      Another
     </Link>
   </>
 )
diff --git a/test/integration/production-swcminify/pages/another.js b/test/integration/production-swcminify/pages/another.js
index 218c5bdae9bb33..9bf76a52e52eef 100644
--- a/test/integration/production-swcminify/pages/another.js
+++ b/test/integration/production-swcminify/pages/another.js
@@ -5,9 +5,7 @@ console.log(url.parse('https://example.com'))
 
 export default () => (
   <div>
-    <Link href="/">
-      <a>Index Page</a>
-    </Link>
+    <Link href="/">Index Page</Link>
     <p>Another</p>
   </div>
 )
diff --git a/test/integration/production-swcminify/pages/client-error.js b/test/integration/production-swcminify/pages/client-error.js
index 4e52886736e0fa..bd240e57e16d3e 100644
--- a/test/integration/production-swcminify/pages/client-error.js
+++ b/test/integration/production-swcminify/pages/client-error.js
@@ -5,9 +5,7 @@ export default function Page(props) {
   return (
     <>
       <Error title="something went wrong (on purpose)" />
-      <Link href="/">
-        <a>to home</a>
-      </Link>
+      <Link href="/">to home</Link>
     </>
   )
 }
diff --git a/test/integration/production-swcminify/pages/counter.js b/test/integration/production-swcminify/pages/counter.js
index 2169b4ed045999..0519794359794d 100644
--- a/test/integration/production-swcminify/pages/counter.js
+++ b/test/integration/production-swcminify/pages/counter.js
@@ -19,12 +19,12 @@ export default class extends Component {
   render() {
     return (
       <div id="counter-page">
-        <Link href="/no-such-page">
-          <a id="no-such-page">No Such Page</a>
+        <Link href="/no-such-page" id="no-such-page">
+          No Such Page
         </Link>
         <br />
-        <Link href="/no-such-page" prefetch>
-          <a id="no-such-page-prefetch">No Such Page (with prefetch)</a>
+        <Link href="/no-such-page" prefetch id="no-such-page-prefetch">
+          No Such Page (with prefetch)
         </Link>
         <p>This is the home.</p>
         <div id="counter">Counter: {counter}</div>
diff --git a/test/integration/production-swcminify/pages/css-and-back.js b/test/integration/production-swcminify/pages/css-and-back.js
index 41b3aea0e46a47..7f590e0d01ee9e 100644
--- a/test/integration/production-swcminify/pages/css-and-back.js
+++ b/test/integration/production-swcminify/pages/css-and-back.js
@@ -3,9 +3,7 @@ import Link from 'next/link'
 const Page = ({ from }) => (
   <div>
     <p>{from}</p>
-    <Link href="/css-modules">
-      <a>Page with CSS</a>
-    </Link>
+    <Link href="/css-modules">Page with CSS</Link>
   </div>
 )
 
diff --git a/test/integration/production-swcminify/pages/development-logs/index.js b/test/integration/production-swcminify/pages/development-logs/index.js
index ee339f890e917c..d5470bd7ac3e01 100644
--- a/test/integration/production-swcminify/pages/development-logs/index.js
+++ b/test/integration/production-swcminify/pages/development-logs/index.js
@@ -4,7 +4,7 @@ export default function IndexPage() {
   return (
     <div>
       <Link href="/about" prefetch>
-        <a>To About Page</a>
+        To About Page
       </Link>
     </div>
   )
diff --git a/test/integration/production-swcminify/pages/dynamic/index.js b/test/integration/production-swcminify/pages/dynamic/index.js
index f41eae2a5804fa..c3311057c2d5a2 100644
--- a/test/integration/production-swcminify/pages/dynamic/index.js
+++ b/test/integration/production-swcminify/pages/dynamic/index.js
@@ -2,8 +2,6 @@ import Link from 'next/link'
 
 export default () => (
   <div>
-    <Link href="/dynamic/no-chunk">
-      <a>No Chunk</a>
-    </Link>
+    <Link href="/dynamic/no-chunk">No Chunk</Link>
   </div>
 )
diff --git a/test/integration/production-swcminify/pages/next-import.js b/test/integration/production-swcminify/pages/next-import.js
index 24cccb8866a0d0..a6088fa8c98938 100644
--- a/test/integration/production-swcminify/pages/next-import.js
+++ b/test/integration/production-swcminify/pages/next-import.js
@@ -6,9 +6,7 @@ import next from 'next'
 
 export default () => (
   <div>
-    <Link href="/about">
-      <a>About Page</a>
-    </Link>
+    <Link href="/about">About Page</Link>
     <p className="index-page">Hello World</p>
   </div>
 )
diff --git a/test/integration/production-swcminify/pages/prefetch.js b/test/integration/production-swcminify/pages/prefetch.js
index 7cc8adab57177c..5e0b4e3e3d3843 100644
--- a/test/integration/production-swcminify/pages/prefetch.js
+++ b/test/integration/production-swcminify/pages/prefetch.js
@@ -5,23 +5,23 @@ export default () => {
     <div>
       <ul>
         <li>
-          <Link href="/" prefetch>
-            <a id="prefetch-1">index</a>
+          <Link href="/" prefetch id="prefetch-1">
+            index
           </Link>
         </li>
         <li>
-          <Link href="/process-env" prefetch>
-            <a id="prefetch-2">process env</a>
+          <Link href="/process-env" prefetch id="prefetch-2">
+            process env
           </Link>
         </li>
         <li>
-          <Link href="/counter" prefetch>
-            <a id="prefetch-3">counter</a>
+          <Link href="/counter" prefetch id="prefetch-3">
+            counter
           </Link>
         </li>
         <li>
-          <Link href="/about" prefetch>
-            <a id="prefetch-4">about</a>
+          <Link href="/about" prefetch id="prefetch-4">
+            about
           </Link>
         </li>
       </ul>
diff --git a/test/integration/production-swcminify/pages/to-nonexistent.js b/test/integration/production-swcminify/pages/to-nonexistent.js
index f92bdea30817d1..45004426671204 100644
--- a/test/integration/production-swcminify/pages/to-nonexistent.js
+++ b/test/integration/production-swcminify/pages/to-nonexistent.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 export default function ToNonexistent() {
   return (
     <div id="blackhole-page">
-      <Link href="/nonexistent">
-        <a id="to-nonexistent-page">Nonexistent Page</a>
+      <Link href="/nonexistent" id="to-nonexistent-page">
+        Nonexistent Page
       </Link>
     </div>
   )
diff --git a/test/integration/production-swcminify/pages/to-shadowed-page.js b/test/integration/production-swcminify/pages/to-shadowed-page.js
index 01c5ee4e3a6472..e4a7e34b3189b3 100644
--- a/test/integration/production-swcminify/pages/to-shadowed-page.js
+++ b/test/integration/production-swcminify/pages/to-shadowed-page.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 export default function ToShadowed() {
   return (
     <div id="shadowed-page-gateway">
-      <Link href="/shadowed-page">
-        <a id="to-shadowed-page">Shadowed Page</a>
+      <Link href="/shadowed-page" id="to-shadowed-page">
+        Shadowed Page
       </Link>
     </div>
   )
diff --git a/test/integration/production/pages/another.js b/test/integration/production/pages/another.js
index 218c5bdae9bb33..9bf76a52e52eef 100644
--- a/test/integration/production/pages/another.js
+++ b/test/integration/production/pages/another.js
@@ -5,9 +5,7 @@ console.log(url.parse('https://example.com'))
 
 export default () => (
   <div>
-    <Link href="/">
-      <a>Index Page</a>
-    </Link>
+    <Link href="/">Index Page</Link>
     <p>Another</p>
   </div>
 )
diff --git a/test/integration/production/pages/client-error.js b/test/integration/production/pages/client-error.js
index 4e52886736e0fa..bd240e57e16d3e 100644
--- a/test/integration/production/pages/client-error.js
+++ b/test/integration/production/pages/client-error.js
@@ -5,9 +5,7 @@ export default function Page(props) {
   return (
     <>
       <Error title="something went wrong (on purpose)" />
-      <Link href="/">
-        <a>to home</a>
-      </Link>
+      <Link href="/">to home</Link>
     </>
   )
 }
diff --git a/test/integration/production/pages/counter.js b/test/integration/production/pages/counter.js
index 2169b4ed045999..0519794359794d 100644
--- a/test/integration/production/pages/counter.js
+++ b/test/integration/production/pages/counter.js
@@ -19,12 +19,12 @@ export default class extends Component {
   render() {
     return (
       <div id="counter-page">
-        <Link href="/no-such-page">
-          <a id="no-such-page">No Such Page</a>
+        <Link href="/no-such-page" id="no-such-page">
+          No Such Page
         </Link>
         <br />
-        <Link href="/no-such-page" prefetch>
-          <a id="no-such-page-prefetch">No Such Page (with prefetch)</a>
+        <Link href="/no-such-page" prefetch id="no-such-page-prefetch">
+          No Such Page (with prefetch)
         </Link>
         <p>This is the home.</p>
         <div id="counter">Counter: {counter}</div>
diff --git a/test/integration/production/pages/css-and-back.js b/test/integration/production/pages/css-and-back.js
index 41b3aea0e46a47..7f590e0d01ee9e 100644
--- a/test/integration/production/pages/css-and-back.js
+++ b/test/integration/production/pages/css-and-back.js
@@ -3,9 +3,7 @@ import Link from 'next/link'
 const Page = ({ from }) => (
   <div>
     <p>{from}</p>
-    <Link href="/css-modules">
-      <a>Page with CSS</a>
-    </Link>
+    <Link href="/css-modules">Page with CSS</Link>
   </div>
 )
 
diff --git a/test/integration/production/pages/development-logs/index.js b/test/integration/production/pages/development-logs/index.js
index ee339f890e917c..d5470bd7ac3e01 100644
--- a/test/integration/production/pages/development-logs/index.js
+++ b/test/integration/production/pages/development-logs/index.js
@@ -4,7 +4,7 @@ export default function IndexPage() {
   return (
     <div>
       <Link href="/about" prefetch>
-        <a>To About Page</a>
+        To About Page
       </Link>
     </div>
   )
diff --git a/test/integration/production/pages/dynamic/index.js b/test/integration/production/pages/dynamic/index.js
index f41eae2a5804fa..c3311057c2d5a2 100644
--- a/test/integration/production/pages/dynamic/index.js
+++ b/test/integration/production/pages/dynamic/index.js
@@ -2,8 +2,6 @@ import Link from 'next/link'
 
 export default () => (
   <div>
-    <Link href="/dynamic/no-chunk">
-      <a>No Chunk</a>
-    </Link>
+    <Link href="/dynamic/no-chunk">No Chunk</Link>
   </div>
 )
diff --git a/test/integration/production/pages/next-import.js b/test/integration/production/pages/next-import.js
index 24cccb8866a0d0..a6088fa8c98938 100644
--- a/test/integration/production/pages/next-import.js
+++ b/test/integration/production/pages/next-import.js
@@ -6,9 +6,7 @@ import next from 'next'
 
 export default () => (
   <div>
-    <Link href="/about">
-      <a>About Page</a>
-    </Link>
+    <Link href="/about">About Page</Link>
     <p className="index-page">Hello World</p>
   </div>
 )
diff --git a/test/integration/production/pages/prefetch.js b/test/integration/production/pages/prefetch.js
index 7cc8adab57177c..5e0b4e3e3d3843 100644
--- a/test/integration/production/pages/prefetch.js
+++ b/test/integration/production/pages/prefetch.js
@@ -5,23 +5,23 @@ export default () => {
     <div>
       <ul>
         <li>
-          <Link href="/" prefetch>
-            <a id="prefetch-1">index</a>
+          <Link href="/" prefetch id="prefetch-1">
+            index
           </Link>
         </li>
         <li>
-          <Link href="/process-env" prefetch>
-            <a id="prefetch-2">process env</a>
+          <Link href="/process-env" prefetch id="prefetch-2">
+            process env
           </Link>
         </li>
         <li>
-          <Link href="/counter" prefetch>
-            <a id="prefetch-3">counter</a>
+          <Link href="/counter" prefetch id="prefetch-3">
+            counter
           </Link>
         </li>
         <li>
-          <Link href="/about" prefetch>
-            <a id="prefetch-4">about</a>
+          <Link href="/about" prefetch id="prefetch-4">
+            about
           </Link>
         </li>
       </ul>
diff --git a/test/integration/production/pages/to-nonexistent.js b/test/integration/production/pages/to-nonexistent.js
index f92bdea30817d1..45004426671204 100644
--- a/test/integration/production/pages/to-nonexistent.js
+++ b/test/integration/production/pages/to-nonexistent.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 export default function ToNonexistent() {
   return (
     <div id="blackhole-page">
-      <Link href="/nonexistent">
-        <a id="to-nonexistent-page">Nonexistent Page</a>
+      <Link href="/nonexistent" id="to-nonexistent-page">
+        Nonexistent Page
       </Link>
     </div>
   )
diff --git a/test/integration/production/pages/to-shadowed-page.js b/test/integration/production/pages/to-shadowed-page.js
index 01c5ee4e3a6472..e4a7e34b3189b3 100644
--- a/test/integration/production/pages/to-shadowed-page.js
+++ b/test/integration/production/pages/to-shadowed-page.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 export default function ToShadowed() {
   return (
     <div id="shadowed-page-gateway">
-      <Link href="/shadowed-page">
-        <a id="to-shadowed-page">Shadowed Page</a>
+      <Link href="/shadowed-page" id="to-shadowed-page">
+        Shadowed Page
       </Link>
     </div>
   )
diff --git a/test/integration/profiling/pages/index.js b/test/integration/profiling/pages/index.js
index 5d9383b7d3c128..dfeb49b3a0f5c8 100644
--- a/test/integration/profiling/pages/index.js
+++ b/test/integration/profiling/pages/index.js
@@ -2,9 +2,7 @@ import Link from 'next/link'
 
 export default () => (
   <div>
-    <Link href="/about">
-      <a>About Page</a>
-    </Link>
+    <Link href="/about">About Page</Link>
     <p className="index-page">Hello World</p>
   </div>
 )
diff --git a/test/integration/query-with-encoding/pages/newline.js b/test/integration/query-with-encoding/pages/newline.js
index f54a15a0ec7808..1990194e1df52c 100644
--- a/test/integration/query-with-encoding/pages/newline.js
+++ b/test/integration/query-with-encoding/pages/newline.js
@@ -2,12 +2,15 @@ import Link from 'next/link'
 
 const Another = () => (
   <div>
-    <Link href="/?another=hello%0A">
-      <a id="hello-lf">Hello LF</a>
+    <Link href="/?another=hello%0A" id="hello-lf">
+      Hello LF
     </Link>
     <br />
-    <Link href={{ pathname: '/', query: { complex: 'yes\n' } }}>
-      <a id="hello-complex">Hello Complex</a>
+    <Link
+      href={{ pathname: '/', query: { complex: 'yes\n' } }}
+      id="hello-complex"
+    >
+      Hello Complex
     </Link>
   </div>
 )
diff --git a/test/integration/query-with-encoding/pages/percent.js b/test/integration/query-with-encoding/pages/percent.js
index 293f399e3dad69..a3cb3a1aa614f0 100644
--- a/test/integration/query-with-encoding/pages/percent.js
+++ b/test/integration/query-with-encoding/pages/percent.js
@@ -2,12 +2,15 @@ import Link from 'next/link'
 
 const Another = () => (
   <div>
-    <Link href="/?another=hello%25">
-      <a id="hello-percent">Hello %</a>
+    <Link href="/?another=hello%25" id="hello-percent">
+      Hello %
     </Link>
     <br />
-    <Link href={{ pathname: '/', query: { complex: 'yes%' } }}>
-      <a id="hello-complex">Hello Complex</a>
+    <Link
+      href={{ pathname: '/', query: { complex: 'yes%' } }}
+      id="hello-complex"
+    >
+      Hello Complex
     </Link>
   </div>
 )
diff --git a/test/integration/query-with-encoding/pages/plus.js b/test/integration/query-with-encoding/pages/plus.js
index 9350fb3f5744b0..5f32b73c02283e 100644
--- a/test/integration/query-with-encoding/pages/plus.js
+++ b/test/integration/query-with-encoding/pages/plus.js
@@ -2,12 +2,15 @@ import Link from 'next/link'
 
 const Another = () => (
   <div>
-    <Link href="/?another=hello%2B">
-      <a id="hello-plus">Hello +</a>
+    <Link href="/?another=hello%2B" id="hello-plus">
+      Hello +
     </Link>
     <br />
-    <Link href={{ pathname: '/', query: { complex: 'yes+' } }}>
-      <a id="hello-complex">Hello Complex</a>
+    <Link
+      href={{ pathname: '/', query: { complex: 'yes+' } }}
+      id="hello-complex"
+    >
+      Hello Complex
     </Link>
   </div>
 )
diff --git a/test/integration/query-with-encoding/pages/space.js b/test/integration/query-with-encoding/pages/space.js
index 5c988ec3970999..56229ae9e690b4 100644
--- a/test/integration/query-with-encoding/pages/space.js
+++ b/test/integration/query-with-encoding/pages/space.js
@@ -2,12 +2,15 @@ import Link from 'next/link'
 
 const Another = () => (
   <div>
-    <Link href="/?another=hello%20">
-      <a id="hello-space">Hello Space</a>
+    <Link href="/?another=hello%20" id="hello-space">
+      Hello Space
     </Link>
     <br />
-    <Link href={{ pathname: '/', query: { complex: 'yes ' } }}>
-      <a id="hello-complex">Hello Complex</a>
+    <Link
+      href={{ pathname: '/', query: { complex: 'yes ' } }}
+      id="hello-complex"
+    >
+      Hello Complex
     </Link>
   </div>
 )
diff --git a/test/integration/repeated-slashes/app/pages/invalid.js b/test/integration/repeated-slashes/app/pages/invalid.js
index 907fd59f457a43..b0f1f886e68364 100644
--- a/test/integration/repeated-slashes/app/pages/invalid.js
+++ b/test/integration/repeated-slashes/app/pages/invalid.js
@@ -14,43 +14,43 @@ export default function Invalid() {
   return (
     <>
       <p id="invalid">invalid page</p>
-      <Link href="/another" as="//google.com">
-        <a id="page-with-as-slashes">to /another as //google.com</a>
+      <Link href="/another" as="//google.com" id="page-with-as-slashes">
+        to /another as //google.com
       </Link>
       <br />
 
-      <Link href="//google.com">
-        <a id="href-with-slashes">to //google.com</a>
+      <Link href="//google.com" id="href-with-slashes">
+        to //google.com
       </Link>
       <br />
 
-      <Link href="//google.com?hello=1">
-        <a id="href-with-slashes-query">to //google.com?hello=1</a>
+      <Link href="//google.com?hello=1" id="href-with-slashes-query">
+        to //google.com?hello=1
       </Link>
       <br />
 
-      <Link href="//google.com#hello">
-        <a id="href-with-slashes-hash">to //google.com#hello</a>
+      <Link href="//google.com#hello" id="href-with-slashes-hash">
+        to //google.com#hello
       </Link>
       <br />
 
-      <Link href="/another" as="\/\/google.com">
-        <a id="page-with-as-backslashes">to /another as \\/\\/google.com</a>
+      <Link href="/another" as="\/\/google.com" id="page-with-as-backslashes">
+        to /another as \\/\\/google.com
       </Link>
       <br />
 
-      <Link href="\/\/google.com">
-        <a id="href-with-backslashes">to \\/\\/google.com</a>
+      <Link href="\/\/google.com" id="href-with-backslashes">
+        to \\/\\/google.com
       </Link>
       <br />
 
-      <Link href="\/\/google.com?hello=1">
-        <a id="href-with-backslashes-query">to \\/\\/google.com?hello=1</a>
+      <Link href="\/\/google.com?hello=1" id="href-with-backslashes-query">
+        to \\/\\/google.com?hello=1
       </Link>
       <br />
 
-      <Link href="\/\/google.com#hello">
-        <a id="href-with-backslashes-hash">to \\/\\/google.com#hello</a>
+      <Link href="\/\/google.com#hello" id="href-with-backslashes-hash">
+        to \\/\\/google.com#hello
       </Link>
       <br />
     </>
diff --git a/test/integration/rewrite-with-browser-history/pages/dynamic-page/[[...param]].js b/test/integration/rewrite-with-browser-history/pages/dynamic-page/[[...param]].js
index 47e56e79e024ff..16edf22f68c908 100644
--- a/test/integration/rewrite-with-browser-history/pages/dynamic-page/[[...param]].js
+++ b/test/integration/rewrite-with-browser-history/pages/dynamic-page/[[...param]].js
@@ -10,8 +10,8 @@ export default function Page(props) {
       <p id="pathname">{router.pathname}</p>
       <p id="query">{JSON.stringify(router.query)}</p>
 
-      <Link href="/" as="/">
-        <a id="to-index">Go back to index</a>
+      <Link href="/" as="/" id="to-index">
+        Go back to index
       </Link>
       <br />
     </>
diff --git a/test/integration/rewrites-client-resolving/pages/index.js b/test/integration/rewrites-client-resolving/pages/index.js
index 9041322d8e4c6e..621ff86fc06b5b 100644
--- a/test/integration/rewrites-client-resolving/pages/index.js
+++ b/test/integration/rewrites-client-resolving/pages/index.js
@@ -2,24 +2,24 @@ import Link from 'next/link'
 
 export default () => (
   <>
-    <Link href="/product">
-      <a id="products-link">to /product</a>
+    <Link href="/product" id="products-link">
+      to /product
     </Link>
     <br />
-    <Link href="/product/first">
-      <a id="product-link">to /product/first</a>
+    <Link href="/product/first" id="product-link">
+      to /product/first
     </Link>
     <br />
-    <Link href="/category">
-      <a id="categories-link">to /category</a>
+    <Link href="/category" id="categories-link">
+      to /category
     </Link>
     <br />
-    <Link href="/category/first">
-      <a id="category-link">to /category/first</a>
+    <Link href="/category/first" id="category-link">
+      to /category/first
     </Link>
     <br />
-    <Link href="/category/hello/world">
-      <a id="category-link-again">to /category/hello/world</a>
+    <Link href="/category/hello/world" id="category-link-again">
+      to /category/hello/world
     </Link>
     <br />
   </>
diff --git a/test/integration/rewrites-has-condition/pages/index.js b/test/integration/rewrites-has-condition/pages/index.js
index 03d94c49cc653e..d32592fb1785a5 100644
--- a/test/integration/rewrites-has-condition/pages/index.js
+++ b/test/integration/rewrites-has-condition/pages/index.js
@@ -4,13 +4,13 @@ export default function Page(props) {
   return (
     <>
       <p id="index">index page</p>
-      <Link href="/rewrite-simple">
-        <a id="to-simple">to /rewrite-simple</a>
+      <Link href="/rewrite-simple" id="to-simple">
+        to /rewrite-simple
       </Link>
       <br />
 
-      <Link href="/rewrite-with-has?hasQuery=true">
-        <a id="to-has-rewrite">to /rewrite-with-has?hasQuery=true</a>
+      <Link href="/rewrite-with-has?hasQuery=true" id="to-has-rewrite">
+        to /rewrite-with-has?hasQuery=true
       </Link>
       <br />
     </>
diff --git a/test/integration/rewrites-manual-href-as/pages/another.js b/test/integration/rewrites-manual-href-as/pages/another.js
index daaa9af4d90c25..0c7294454b184d 100644
--- a/test/integration/rewrites-manual-href-as/pages/another.js
+++ b/test/integration/rewrites-manual-href-as/pages/another.js
@@ -10,13 +10,13 @@ export default function Page(props) {
       <p id="pathname">{router.pathname}</p>
       <p id="query">{JSON.stringify(router.query)}</p>
 
-      <Link href="/?imageId=123" as="/preview/123">
-        <a id="to-modal">open modal for /preview/123</a>
+      <Link href="/?imageId=123" as="/preview/123" id="to-modal">
+        open modal for /preview/123
       </Link>
       <br />
 
-      <Link href="/preview/123">
-        <a id="to-preview">go to /preview/123</a>
+      <Link href="/preview/123" id="to-preview">
+        go to /preview/123
       </Link>
       <br />
     </>
diff --git a/test/integration/rewrites-manual-href-as/pages/index.js b/test/integration/rewrites-manual-href-as/pages/index.js
index c6f32b544aea81..e92c8ca292d2f8 100644
--- a/test/integration/rewrites-manual-href-as/pages/index.js
+++ b/test/integration/rewrites-manual-href-as/pages/index.js
@@ -12,28 +12,28 @@ export default function Page(props) {
 
       {router.query.imageId ? <p id="modal">show modal</p> : null}
 
-      <Link href="/?imageId=123" as="/preview/123">
-        <a id="to-modal">open modal for /preview/123</a>
+      <Link href="/?imageId=123" as="/preview/123" id="to-modal">
+        open modal for /preview/123
       </Link>
       <br />
 
-      <Link href="/preview/123">
-        <a id="to-preview">go to /preview/123</a>
+      <Link href="/preview/123" id="to-preview">
+        go to /preview/123
       </Link>
       <br />
 
-      <Link href="/another">
-        <a id="to-another">go to /another</a>
+      <Link href="/another" id="to-another">
+        go to /another
       </Link>
       <br />
 
-      <Link href="/rewrite-me">
-        <a id="to-rewrite-me">go to /rewrite-me</a>
+      <Link href="/rewrite-me" id="to-rewrite-me">
+        go to /rewrite-me
       </Link>
       <br />
 
-      <Link href="/" as="/rewrite-me">
-        <a id="to-index-as-rewrite">go to / as /rewrite-me</a>
+      <Link href="/" as="/rewrite-me" id="to-index-as-rewrite">
+        go to / as /rewrite-me
       </Link>
       <br />
     </>
diff --git a/test/integration/rewrites-manual-href-as/pages/preview/[slug].js b/test/integration/rewrites-manual-href-as/pages/preview/[slug].js
index babe69b8629a43..3fdfd7c328774f 100644
--- a/test/integration/rewrites-manual-href-as/pages/preview/[slug].js
+++ b/test/integration/rewrites-manual-href-as/pages/preview/[slug].js
@@ -27,31 +27,32 @@ export default function Page(props) {
       <p id="query">{JSON.stringify(router.query)}</p>
       <p id="props">{JSON.stringify(props)}</p>
 
-      <Link href="/?imageId=123" as="/preview/123">
-        <a id="to-modal">open modal for /preview/123</a>
+      <Link href="/?imageId=123" as="/preview/123" id="to-modal">
+        open modal for /preview/123
       </Link>
       <br />
 
-      <Link href="/preview/321">
-        <a id="to-preview">go to /preview/321</a>
+      <Link href="/preview/321" id="to-preview">
+        go to /preview/321
       </Link>
       <br />
 
-      <Link href="/another">
-        <a id="to-another">go to /another</a>
+      <Link href="/another" id="to-another">
+        go to /another
       </Link>
       <br />
 
-      <Link href="/rewrite-me">
-        <a id="to-rewrite-me">go to /rewrite-me</a>
+      <Link href="/rewrite-me" id="to-rewrite-me">
+        go to /rewrite-me
       </Link>
       <br />
 
       <Link
         href={{ pathname: '/preview/[slug]', query: { slug: '321' } }}
         as="/rewrite-me"
+        id="to-preview-as-rewrite"
       >
-        <a id="to-preview-as-rewrite">go to /preview/321 as /rewrite-me</a>
+        go to /preview/321 as /rewrite-me
       </Link>
       <br />
     </>
diff --git a/test/integration/route-load-cancel-css/pages/index.js b/test/integration/route-load-cancel-css/pages/index.js
index b9b2e535383ca0..852a5d413f9fb4 100644
--- a/test/integration/route-load-cancel-css/pages/index.js
+++ b/test/integration/route-load-cancel-css/pages/index.js
@@ -15,11 +15,11 @@ export default () => {
   }, [router.events])
   return (
     <>
-      <Link href="/page1">
-        <a id="link-1">Page 1</a>
+      <Link href="/page1" id="link-1">
+        Page 1
       </Link>{' '}
-      <Link href="/page2">
-        <a id="link-2">Page 2</a>
+      <Link href="/page2" id="link-2">
+        Page 2
       </Link>
     </>
   )
diff --git a/test/integration/route-load-cancel/pages/index.js b/test/integration/route-load-cancel/pages/index.js
index b9b2e535383ca0..852a5d413f9fb4 100644
--- a/test/integration/route-load-cancel/pages/index.js
+++ b/test/integration/route-load-cancel/pages/index.js
@@ -15,11 +15,11 @@ export default () => {
   }, [router.events])
   return (
     <>
-      <Link href="/page1">
-        <a id="link-1">Page 1</a>
+      <Link href="/page1" id="link-1">
+        Page 1
       </Link>{' '}
-      <Link href="/page2">
-        <a id="link-2">Page 2</a>
+      <Link href="/page2" id="link-2">
+        Page 2
       </Link>
     </>
   )
diff --git a/test/integration/router-hash-navigation/pages/index.js b/test/integration/router-hash-navigation/pages/index.js
index 0170d3ea19e580..9781cbdabf3d5a 100644
--- a/test/integration/router-hash-navigation/pages/index.js
+++ b/test/integration/router-hash-navigation/pages/index.js
@@ -4,11 +4,11 @@ export default function Page() {
   return (
     <div>
       <div style={{ height: '100vh' }} />
-      <Link href="/">
-        <a id="top-link">top</a>
+      <Link href="/" id="top-link">
+        top
       </Link>
-      <Link href="#section">
-        <a id="section-link">section link</a>
+      <Link href="#section" id="section-link">
+        section link
       </Link>
       <section id="section">section content</section>
     </div>
diff --git a/test/integration/scroll-back-restoration/pages/another.js b/test/integration/scroll-back-restoration/pages/another.js
index 340b4403e3d807..076bf9c911e9e7 100644
--- a/test/integration/scroll-back-restoration/pages/another.js
+++ b/test/integration/scroll-back-restoration/pages/another.js
@@ -4,8 +4,8 @@ export default function Page() {
   return (
     <>
       <p id="another">hi from another</p>
-      <Link href="/">
-        <a id="to-index">to index</a>
+      <Link href="/" id="to-index">
+        to index
       </Link>
     </>
   )
diff --git a/test/integration/scroll-back-restoration/pages/index.js b/test/integration/scroll-back-restoration/pages/index.js
index edb974d3b7b5f5..2a3e9af4ab39f2 100644
--- a/test/integration/scroll-back-restoration/pages/index.js
+++ b/test/integration/scroll-back-restoration/pages/index.js
@@ -2,17 +2,16 @@ import Link from 'next/link'
 
 const Page = ({ loaded }) => {
   const link = (
-    <Link href="/another">
-      <a
-        id="to-another"
-        style={{
-          marginLeft: 5000,
-          width: 95000,
-          display: 'block',
-        }}
-      >
-        to another
-      </a>
+    <Link
+      href="/another"
+      id="to-another"
+      style={{
+        marginLeft: 5000,
+        width: 95000,
+        display: 'block',
+      }}
+    >
+      to another
     </Link>
   )
 
diff --git a/test/integration/scroll-forward-restoration/pages/another.js b/test/integration/scroll-forward-restoration/pages/another.js
index a37308e7d87796..2941c7ed6ac759 100644
--- a/test/integration/scroll-forward-restoration/pages/another.js
+++ b/test/integration/scroll-forward-restoration/pages/another.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 export default () => (
   <>
     <p id="another">hi from another</p>
-    <Link href="/">
-      <a id="to-index">to index</a>
+    <Link href="/" id="to-index">
+      to index
     </Link>
   </>
 )
diff --git a/test/integration/scroll-forward-restoration/pages/index.js b/test/integration/scroll-forward-restoration/pages/index.js
index edb974d3b7b5f5..2a3e9af4ab39f2 100644
--- a/test/integration/scroll-forward-restoration/pages/index.js
+++ b/test/integration/scroll-forward-restoration/pages/index.js
@@ -2,17 +2,16 @@ import Link from 'next/link'
 
 const Page = ({ loaded }) => {
   const link = (
-    <Link href="/another">
-      <a
-        id="to-another"
-        style={{
-          marginLeft: 5000,
-          width: 95000,
-          display: 'block',
-        }}
-      >
-        to another
-      </a>
+    <Link
+      href="/another"
+      id="to-another"
+      style={{
+        marginLeft: 5000,
+        width: 95000,
+        display: 'block',
+      }}
+    >
+      to another
     </Link>
   )
 
diff --git a/test/integration/scss-fixtures/multi-module/pages/blue.js b/test/integration/scss-fixtures/multi-module/pages/blue.js
index 1c45c34e41a842..f542fd8f97b72c 100644
--- a/test/integration/scss-fixtures/multi-module/pages/blue.js
+++ b/test/integration/scss-fixtures/multi-module/pages/blue.js
@@ -8,12 +8,12 @@ export default function Blue() {
         This text should be blue.
       </div>
       <br />
-      <Link href="/red" prefetch>
-        <a id="link-red">Red</a>
+      <Link href="/red" prefetch id="link-red">
+        Red
       </Link>
       <br />
-      <Link href="/none" prefetch={false}>
-        <a id="link-none">None</a>
+      <Link href="/none" prefetch={false} id="link-none">
+        None
       </Link>
     </>
   )
diff --git a/test/integration/scss-fixtures/multi-module/pages/none.js b/test/integration/scss-fixtures/multi-module/pages/none.js
index f26c2d80b3ae0a..6a455d95858cd0 100644
--- a/test/integration/scss-fixtures/multi-module/pages/none.js
+++ b/test/integration/scss-fixtures/multi-module/pages/none.js
@@ -7,12 +7,12 @@ export default function None() {
         This text should be black.
       </div>
       <br />
-      <Link href="/red" prefetch={false}>
-        <a id="link-red">Red</a>
+      <Link href="/red" prefetch={false} id="link-red">
+        Red
       </Link>
       <br />
-      <Link href="/blue" prefetch={false}>
-        <a id="link-blue">Blue</a>
+      <Link href="/blue" prefetch={false} id="link-blue">
+        Blue
       </Link>
     </>
   )
diff --git a/test/integration/scss-fixtures/multi-module/pages/red.js b/test/integration/scss-fixtures/multi-module/pages/red.js
index af8b6991599866..2d55e37e5571fc 100644
--- a/test/integration/scss-fixtures/multi-module/pages/red.js
+++ b/test/integration/scss-fixtures/multi-module/pages/red.js
@@ -8,12 +8,12 @@ export default function Red() {
         This text should be red.
       </div>
       <br />
-      <Link href="/blue" prefetch={false}>
-        <a id="link-blue">Blue</a>
+      <Link href="/blue" prefetch={false} id="link-blue">
+        Blue
       </Link>
       <br />
-      <Link href="/none" prefetch={false}>
-        <a id="link-none">None</a>
+      <Link href="/none" prefetch={false} id="link-none">
+        None
       </Link>
     </>
   )
diff --git a/test/integration/scss-fixtures/multi-page/pages/page1.js b/test/integration/scss-fixtures/multi-page/pages/page1.js
index 94b9d0f24ca37d..bbb3756ceaed3c 100644
--- a/test/integration/scss-fixtures/multi-page/pages/page1.js
+++ b/test/integration/scss-fixtures/multi-page/pages/page1.js
@@ -6,9 +6,7 @@ export default function Page1() {
       <br />
       <input key={'' + Math.random()} id="text-input" type="text" />
       <br />
-      <Link href="/page2">
-        <a>Switch page</a>
-      </Link>
+      <Link href="/page2">Switch page</Link>
     </>
   )
 }
diff --git a/test/integration/scss-fixtures/multi-page/pages/page2.js b/test/integration/scss-fixtures/multi-page/pages/page2.js
index e8e49a87514dc7..10f2c5792255bf 100644
--- a/test/integration/scss-fixtures/multi-page/pages/page2.js
+++ b/test/integration/scss-fixtures/multi-page/pages/page2.js
@@ -6,9 +6,7 @@ export default function Page2() {
       <br />
       <input key={'' + Math.random()} id="text-input" type="text" />
       <br />
-      <Link href="/page1">
-        <a>Switch page</a>
-      </Link>
+      <Link href="/page1">Switch page</Link>
     </>
   )
 }
diff --git a/test/integration/scss-fixtures/with-tailwindcss-and-purgecss/pages/index.js b/test/integration/scss-fixtures/with-tailwindcss-and-purgecss/pages/index.js
index 488d8b23c4e934..0c1d2b7cae38a2 100644
--- a/test/integration/scss-fixtures/with-tailwindcss-and-purgecss/pages/index.js
+++ b/test/integration/scss-fixtures/with-tailwindcss-and-purgecss/pages/index.js
@@ -10,8 +10,8 @@ function Nav() {
     <nav>
       <ul className="flex justify-between items-center p-8">
         <li>
-          <Link href="/">
-            <a className="text-blue-500 no-underline">Home</a>
+          <Link href="/" className="text-blue-500 no-underline">
+            Home
           </Link>
         </li>
         <ul className="flex justify-between items-center">
diff --git a/test/integration/serverless-trace/pages/index.js b/test/integration/serverless-trace/pages/index.js
index 496f4577305102..0dc47ec0eba6d0 100644
--- a/test/integration/serverless-trace/pages/index.js
+++ b/test/integration/serverless-trace/pages/index.js
@@ -3,8 +3,8 @@ export default () => {
   return (
     <div>
       Hello World
-      <Link href="/fetch">
-        <a id="fetchlink">fetch page</a>
+      <Link href="/fetch" id="fetchlink">
+        fetch page
       </Link>
     </div>
   )
diff --git a/test/integration/serverless/pages/index.js b/test/integration/serverless/pages/index.js
index a0ce78cd422b05..d16232feaadca4 100644
--- a/test/integration/serverless/pages/index.js
+++ b/test/integration/serverless/pages/index.js
@@ -3,11 +3,11 @@ export default () => {
   return (
     <div>
       Hello World
-      <Link href="/fetch">
-        <a id="fetchlink">fetch page</a>
+      <Link href="/fetch" id="fetchlink">
+        fetch page
       </Link>
-      <Link href="/fetch-cjs">
-        <a id="fetchcjslink">fetch cjs page</a>
+      <Link href="/fetch-cjs" id="fetchcjslink">
+        fetch cjs page
       </Link>
     </div>
   )
diff --git a/test/integration/src-dir-support/src/pages/index.js b/test/integration/src-dir-support/src/pages/index.js
index de7292948b5a54..2310d5a531fb6c 100644
--- a/test/integration/src-dir-support/src/pages/index.js
+++ b/test/integration/src-dir-support/src/pages/index.js
@@ -3,28 +3,48 @@ import Link from 'next/link'
 const Page = () => (
   <div>
     <h3>My blog</h3>
-    <Link href="/[post]" as="/post-1">
-      <a id="view-post-1">View post 1</a>
+    <Link href="/[post]" as="/post-1" id="view-post-1">
+      View post 1
     </Link>
     <br />
-    <Link href="/[post]/comments" as="/post-1/comments">
-      <a id="view-post-1-comments">View post 1 comments</a>
+    <Link
+      href="/[post]/comments"
+      as="/post-1/comments"
+      id="view-post-1-comments"
+    >
+      View post 1 comments
     </Link>
     <br />
-    <Link href="/[post]/[comment]" as="/post-1/comment-1">
-      <a id="view-post-1-comment-1">View comment 1 on post 1</a>
+    <Link
+      href="/[post]/[comment]"
+      as="/post-1/comment-1"
+      id="view-post-1-comment-1"
+    >
+      View comment 1 on post 1
     </Link>
     <br />
-    <Link href="/blog/[post]/comment/[id]" as="/blog/321/comment/123">
-      <a id="view-nested-dynamic-cmnt">View comment 123 on blog post 321</a>
+    <Link
+      href="/blog/[post]/comment/[id]"
+      as="/blog/321/comment/123"
+      id="view-nested-dynamic-cmnt"
+    >
+      View comment 123 on blog post 321
     </Link>
     <br />
-    <Link href="/[post]?fromHome=true" as="/post-1?fromHome=true">
-      <a id="view-post-1-with-query">View post 1 with query</a>
+    <Link
+      href="/[post]?fromHome=true"
+      as="/post-1?fromHome=true"
+      id="view-post-1-with-query"
+    >
+      View post 1 with query
     </Link>
     <br />
-    <Link href="/on-mount/[post]" as="/on-mount/test-w-hash#item-400">
-      <a id="view-dynamic-with-hash">View test with hash</a>
+    <Link
+      href="/on-mount/[post]"
+      as="/on-mount/test-w-hash#item-400"
+      id="view-dynamic-with-hash"
+    >
+      View test with hash
     </Link>
   </div>
 )
diff --git a/test/integration/static-page-name/pages/index.js b/test/integration/static-page-name/pages/index.js
index f51a79aa9d07bc..39244a4b988f9c 100644
--- a/test/integration/static-page-name/pages/index.js
+++ b/test/integration/static-page-name/pages/index.js
@@ -3,8 +3,8 @@ import Link from 'next/link'
 export default () => (
   <>
     <h3>Hello</h3>
-    <Link href="/static">
-      <a id="to-static">To static</a>
+    <Link href="/static" id="to-static">
+      To static
     </Link>
   </>
 )
diff --git a/test/integration/trailing-slashes-href-resolving/pages/index.js b/test/integration/trailing-slashes-href-resolving/pages/index.js
index 3d60ad54b9b49c..54481b0ecee5f2 100644
--- a/test/integration/trailing-slashes-href-resolving/pages/index.js
+++ b/test/integration/trailing-slashes-href-resolving/pages/index.js
@@ -3,32 +3,32 @@ import Link from 'next/link'
 export default function Index() {
   return (
     <>
-      <Link href="/blog/another/">
-        <a id="to-blog-another">to /blog/another/</a>
+      <Link href="/blog/another/" id="to-blog-another">
+        to /blog/another/
       </Link>
       <br />
-      <Link href="/blog/first-post/">
-        <a id="to-blog-post">to /blog/first-post/</a>
+      <Link href="/blog/first-post/" id="to-blog-post">
+        to /blog/first-post/
       </Link>
       <br />
-      <Link href="/catch-all/hello/world/">
-        <a id="to-catch-all-item">to /catch-all/hello/world/</a>
+      <Link href="/catch-all/hello/world/" id="to-catch-all-item">
+        to /catch-all/hello/world/
       </Link>
       <br />
-      <Link href="/catch-all/first/">
-        <a id="to-catch-all-first">to /catch-all/first/</a>
+      <Link href="/catch-all/first/" id="to-catch-all-first">
+        to /catch-all/first/
       </Link>
       <br />
-      <Link href="/another/">
-        <a id="to-another">to /another/</a>
+      <Link href="/another/" id="to-another">
+        to /another/
       </Link>
       <br />
-      <Link href="/top-level-slug/">
-        <a id="to-slug">to /top-level-slug/</a>
+      <Link href="/top-level-slug/" id="to-slug">
+        to /top-level-slug/
       </Link>
       <br />
-      <Link as="/world" href="/[slug]">
-        <a id="to-slug-manual">to /world/</a>
+      <Link as="/world" href="/[slug]" id="to-slug-manual">
+        to /world/
       </Link>
       <br />
     </>
diff --git a/test/integration/trailing-slashes/pages/external-linker.js b/test/integration/trailing-slashes/pages/external-linker.js
index a9665a41fef64d..91e207d5b256e2 100644
--- a/test/integration/trailing-slashes/pages/external-linker.js
+++ b/test/integration/trailing-slashes/pages/external-linker.js
@@ -14,8 +14,8 @@ export default function ExternalLinker({ href }) {
   }
   return (
     <div>
-      <Link href={href}>
-        <a id="link">link to {href}</a>
+      <Link href={href} id="link">
+        link to{href}
       </Link>
       <button id="route-pusher" onClick={pushRoute}>
         push route {href}
diff --git a/test/integration/trailing-slashes/pages/linker.js b/test/integration/trailing-slashes/pages/linker.js
index e70939a79867ac..928590b8e1d82c 100644
--- a/test/integration/trailing-slashes/pages/linker.js
+++ b/test/integration/trailing-slashes/pages/linker.js
@@ -14,8 +14,8 @@ export default function Linker({ href }) {
   }
   return (
     <div>
-      <Link href={href}>
-        <a id="link">link to {href}</a>
+      <Link href={href} id="link">
+        link to{href}
       </Link>
       <button id="route-pusher" onClick={pushRoute}>
         push route {href}
diff --git a/test/integration/typescript/components/link.tsx b/test/integration/typescript/components/link.tsx
index df69863b2863f1..92c88519b43e7c 100644
--- a/test/integration/typescript/components/link.tsx
+++ b/test/integration/typescript/components/link.tsx
@@ -7,9 +7,5 @@ export default () => {
     as: '/as-page',
   }
 
-  return (
-    <Link {...props}>
-      <a>Test</a>
-    </Link>
-  )
+  return <Link {...props}>Test</Link>
 }
diff --git a/test/integration/with-electron/app/pages/about.js b/test/integration/with-electron/app/pages/about.js
index 292ba115726638..7a5816f28cc254 100644
--- a/test/integration/with-electron/app/pages/about.js
+++ b/test/integration/with-electron/app/pages/about.js
@@ -3,8 +3,6 @@ import Link from 'next/link'
 export default () => (
   <div id="about-page">
     <p>This is the about page</p>
-    <Link href="/">
-      <a>Go Back</a>
-    </Link>
+    <Link href="/">Go Back</Link>
   </div>
 )
diff --git a/test/integration/with-electron/app/pages/index.js b/test/integration/with-electron/app/pages/index.js
index 6f7f77ddf3d127..dac6b9c92558cb 100644
--- a/test/integration/with-electron/app/pages/index.js
+++ b/test/integration/with-electron/app/pages/index.js
@@ -9,8 +9,8 @@ function routeToAbout(e) {
 export default () => (
   <div id="home-page">
     <p>This is the home page</p>
-    <Link href="/about">
-      <a id="about-via-link">about via Link</a>
+    <Link href="/about" id="about-via-link">
+      about via Link
     </Link>
     <a id="about-via-router" onClick={routeToAbout} href="#">
       about via Router
diff --git a/test/integration/with-router/components/header-nav.js b/test/integration/with-router/components/header-nav.js
index 1e203f407784bd..277c12cdfed109 100644
--- a/test/integration/with-router/components/header-nav.js
+++ b/test/integration/with-router/components/header-nav.js
@@ -59,20 +59,21 @@ class HeaderNav extends React.Component {
     return (
       <nav>
         {Object.keys(pages).map((url) => (
-          <Link href={url} key={url} prefetch>
-            <a
-              className={`${this.state.activeURL === url ? 'active' : ''} ${
-                this.state.activeURLTopLevelRouter === url
-                  ? 'active-top-level-router'
-                  : ''
-              } ${
-                this.state.activeURLTopLevelRouterDeprecatedBehavior === url
-                  ? 'active-top-level-router-deprecated-behavior'
-                  : ''
-              }`}
-            >
-              {pages[url]}
-            </a>
+          <Link
+            href={url}
+            key={url}
+            prefetch
+            className={`${this.state.activeURL === url ? 'active' : ''} ${
+              this.state.activeURLTopLevelRouter === url
+                ? 'active-top-level-router'
+                : ''
+            } ${
+              this.state.activeURLTopLevelRouterDeprecatedBehavior === url
+                ? 'active-top-level-router-deprecated-behavior'
+                : ''
+            }`}
+          >
+            {pages[url]}
           </Link>
         ))}
       </nav>
diff --git a/test/production/jest/new-link-behavior.test.ts b/test/production/jest/new-link-behavior.test.ts
index f088713a443a83..75da74a2c588e5 100644
--- a/test/production/jest/new-link-behavior.test.ts
+++ b/test/production/jest/new-link-behavior.test.ts
@@ -1,7 +1,7 @@
 import { createNext } from 'e2e-utils'
 import { NextInstance } from 'test/lib/next-modes/base'
 
-describe('next/jest', () => {
+describe('next/jest newLinkBehavior', () => {
   let next: NextInstance
 
   if (process.env.NEXT_TEST_REACT_VERSION === '^17') {
@@ -17,7 +17,7 @@ describe('next/jest', () => {
           import Link from 'next/link'
 
           export default function Page() {
-            return <Link href='https://example.com'><a>Hello World!</a></Link>
+            return <Link href='https://example.com'><div>Hello World!</div></Link>
           }
         `,
         'test/index.test.jsx': `
@@ -57,30 +57,7 @@ describe('next/jest', () => {
 
   afterAll(() => next.destroy())
 
-  it(`should use normal Link behavior when newNextLinkBehavior is unset`, async () => {
-    await next.start()
-  })
-
-  it(`should use new link behavior when newNextLinkBehavior is true`, async () => {
-    await next.stop()
-
-    await next.patchFile(
-      'pages/index.jsx',
-      `
-      import Link from 'next/link'
-
-      export default function Page() {
-        return <Link href='https://example.com'><div>Hello World!</div></Link>
-      }
-    `
-    )
-    await next.patchFile(
-      'next.config.js',
-      `
-      module.exports = { experimental: { newNextLinkBehavior: true } }
-    `
-    )
-
+  it(`should use new link behavior`, async () => {
     await next.start()
   })
 })
diff --git a/test/production/prerender-prefetch/app/pages/index.js b/test/production/prerender-prefetch/app/pages/index.js
index 1d440965f0a245..611a443b778542 100644
--- a/test/production/prerender-prefetch/app/pages/index.js
+++ b/test/production/prerender-prefetch/app/pages/index.js
@@ -5,12 +5,12 @@ export default function Page(props) {
     <>
       <p id="page">index</p>
       <p id="props">{JSON.stringify(props)}</p>
-      <Link href="/blog/first">
-        <a id="to-blog-first">/blog/first</a>
+      <Link href="/blog/first" id="to-blog-first">
+        /blog/first
       </Link>
       <br />
-      <Link href="/blog/second">
-        <a id="to-blog-second">/blog/second</a>
+      <Link href="/blog/second" id="to-blog-second">
+        /blog/second
       </Link>
       <br />
     </>
diff --git a/test/production/standalone-mode/required-server-files/pages/index.js b/test/production/standalone-mode/required-server-files/pages/index.js
index 8e07e517346157..5aa751a3403586 100644
--- a/test/production/standalone-mode/required-server-files/pages/index.js
+++ b/test/production/standalone-mode/required-server-files/pages/index.js
@@ -30,9 +30,7 @@ export default function Page(props) {
       <p id="index">index page</p>
       <p id="router">{JSON.stringify(router)}</p>
       <p id="props">{JSON.stringify(props)}</p>
-      <Link href="gsp">
-        <a>to /gsp</a>
-      </Link>
+      <Link href="gsp">to /gsp</Link>
     </>
   )
 }
diff --git a/test/production/typescript-basic/app/pages/index.tsx b/test/production/typescript-basic/app/pages/index.tsx
index e974da66bbafd9..94e197abd4557f 100644
--- a/test/production/typescript-basic/app/pages/index.tsx
+++ b/test/production/typescript-basic/app/pages/index.tsx
@@ -12,9 +12,7 @@ export default function Page() {
   return (
     <>
       <p>hello world</p>
-      <Link href="/another">
-        <a>to /another</a>
-      </Link>
+      <Link href="/another">to /another</Link>
     </>
   )
 }
diff --git a/test/production/typescript-basic/app/pages/page-config.tsx b/test/production/typescript-basic/app/pages/page-config.tsx
index 1f3e7c5d6c4da7..39b32e9cd91f24 100644
--- a/test/production/typescript-basic/app/pages/page-config.tsx
+++ b/test/production/typescript-basic/app/pages/page-config.tsx
@@ -9,9 +9,7 @@ export default function Page() {
   return (
     <>
       <p>hello world</p>
-      <Link href="/another">
-        <a>to /another</a>
-      </Link>
+      <Link href="/another">to /another</Link>
     </>
   )
 }