diff --git a/.gitmodules b/.gitmodules
index d68d5beff2..aa7c843b31 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -182,10 +182,6 @@
 	path = modules/Templating
 	url = https://github.com/aspnet/Templating.git
 	branch = dev
-[submodule "modules/Testing"]
-	path = modules/Testing
-	url = https://github.com/aspnet/Testing.git
-	branch = dev
 [submodule "modules/WebSockets"]
 	path = modules/WebSockets
 	url = https://github.com/aspnet/WebSockets.git
diff --git a/build/buildorder.props b/build/buildorder.props
index 45aab39853..4c4e98d981 100644
--- a/build/buildorder.props
+++ b/build/buildorder.props
@@ -2,7 +2,6 @@
   <ItemGroup>
     <RepositoryBuildOrder Include="Common" Order="1" />
     <RepositoryBuildOrder Include="Microsoft.Data.Sqlite" Order="1" />
-    <RepositoryBuildOrder Include="Testing" Order="1" />
     <RepositoryBuildOrder Include="DependencyInjection" Order="2" />
     <RepositoryBuildOrder Include="FileSystem" Order="2" />
     <RepositoryBuildOrder Include="EventNotification" Order="2" />
diff --git a/build/submodules.props b/build/submodules.props
index f53c21c4f6..a5ff155336 100644
--- a/build/submodules.props
+++ b/build/submodules.props
@@ -51,7 +51,6 @@
     <Repository Include="Session" />
     <Repository Include="SignalR" />
     <Repository Include="StaticFiles" />
-    <Repository Include="Testing" />
     <Repository Include="WebHooks" />
     <Repository Include="WebSockets" />
   </ItemGroup>
diff --git a/modules/SubmoduleGraph.dgml b/modules/SubmoduleGraph.dgml
index cdcd0a92cd..b67a8dc6db 100644
--- a/modules/SubmoduleGraph.dgml
+++ b/modules/SubmoduleGraph.dgml
@@ -46,17 +46,19 @@
     <Node Id="Session" Label="Session" />
     <Node Id="SignalR" Label="SignalR" />
     <Node Id="StaticFiles" Label="StaticFiles" />
-    <Node Id="Testing" Label="Testing" />
     <Node Id="WebHooks" Label="WebHooks" />
     <Node Id="WebSockets" Label="WebSockets" />
   </Nodes>
   <Links>
     <Link Source="AADIntegration" Target="BasicMiddleware" />
     <Link Source="AADIntegration" Target="Configuration" />
+    <Link Source="AADIntegration" Target="DataProtection" />
+    <Link Source="AADIntegration" Target="Hosting" />
     <Link Source="AADIntegration" Target="IISIntegration" />
     <Link Source="AADIntegration" Target="KestrelHttpServer" />
     <Link Source="AADIntegration" Target="Logging" />
     <Link Source="AADIntegration" Target="Mvc" />
+    <Link Source="AADIntegration" Target="Razor" />
     <Link Source="AADIntegration" Target="Security" />
     <Link Source="AADIntegration" Target="StaticFiles" />
     <Link Source="Antiforgery" Target="Common" />
@@ -65,7 +67,7 @@
     <Link Source="Antiforgery" Target="HtmlAbstractions" />
     <Link Source="Antiforgery" Target="HttpAbstractions" />
     <Link Source="Antiforgery" Target="Logging" />
-    <Link Source="Antiforgery" Target="Testing" />
+    <Link Source="AuthSamples" Target="Common" />
     <Link Source="AuthSamples" Target="Configuration" />
     <Link Source="AuthSamples" Target="DataProtection" />
     <Link Source="AuthSamples" Target="Diagnostics" />
@@ -77,9 +79,9 @@
     <Link Source="AuthSamples" Target="Logging" />
     <Link Source="AuthSamples" Target="MetaPackages" />
     <Link Source="AuthSamples" Target="Mvc" />
+    <Link Source="AuthSamples" Target="Razor" />
     <Link Source="AuthSamples" Target="Security" />
     <Link Source="AuthSamples" Target="StaticFiles" />
-    <Link Source="AuthSamples" Target="Testing" />
     <Link Source="AzureIntegration" Target="Common" />
     <Link Source="AzureIntegration" Target="Configuration" />
     <Link Source="AzureIntegration" Target="EventNotification" />
@@ -96,19 +98,17 @@
     <Link Source="BasicMiddleware" Target="KestrelHttpServer" />
     <Link Source="BasicMiddleware" Target="Logging" />
     <Link Source="BasicMiddleware" Target="Options" />
+    <Link Source="BrowserLink" Target="Common" />
     <Link Source="BrowserLink" Target="FileSystem" />
     <Link Source="BrowserLink" Target="Hosting" />
     <Link Source="BrowserLink" Target="HttpAbstractions" />
-    <Link Source="BrowserLink" Target="Testing" />
     <Link Source="Caching" Target="Common" />
     <Link Source="Caching" Target="Configuration" />
     <Link Source="Caching" Target="DependencyInjection" />
     <Link Source="Caching" Target="FileSystem" />
     <Link Source="Caching" Target="Options" />
-    <Link Source="Caching" Target="Testing" />
     <Link Source="Configuration" Target="Common" />
     <Link Source="Configuration" Target="FileSystem" />
-    <Link Source="Configuration" Target="Testing" />
     <Link Source="CORS" Target="Configuration" />
     <Link Source="CORS" Target="DependencyInjection" />
     <Link Source="CORS" Target="Hosting" />
@@ -123,9 +123,7 @@
     <Link Source="DataProtection" Target="Hosting" />
     <Link Source="DataProtection" Target="Logging" />
     <Link Source="DataProtection" Target="Options" />
-    <Link Source="DataProtection" Target="Testing" />
     <Link Source="DependencyInjection" Target="Common" />
-    <Link Source="DependencyInjection" Target="Testing" />
     <Link Source="Diagnostics" Target="Common" />
     <Link Source="Diagnostics" Target="DependencyInjection" />
     <Link Source="Diagnostics" Target="EntityFrameworkCore" />
@@ -138,19 +136,16 @@
     <Link Source="Diagnostics" Target="Logging" />
     <Link Source="Diagnostics" Target="Options" />
     <Link Source="Diagnostics" Target="StaticFiles" />
-    <Link Source="Diagnostics" Target="Testing" />
     <Link Source="DotNetTools" Target="Common" />
     <Link Source="DotNetTools" Target="Configuration" />
-    <Link Source="DotNetTools" Target="Testing" />
     <Link Source="EntityFrameworkCore" Target="Caching" />
     <Link Source="EntityFrameworkCore" Target="Configuration" />
     <Link Source="EntityFrameworkCore" Target="DependencyInjection" />
     <Link Source="EntityFrameworkCore" Target="Hosting" />
     <Link Source="EntityFrameworkCore" Target="Logging" />
     <Link Source="EntityFrameworkCore" Target="Microsoft.Data.Sqlite" />
-    <Link Source="EventNotification" Target="Testing" />
+    <Link Source="EventNotification" Target="Common" />
     <Link Source="FileSystem" Target="Common" />
-    <Link Source="FileSystem" Target="Testing" />
     <Link Source="Hosting" Target="Common" />
     <Link Source="Hosting" Target="Configuration" />
     <Link Source="Hosting" Target="DependencyInjection" />
@@ -159,25 +154,22 @@
     <Link Source="Hosting" Target="HttpAbstractions" />
     <Link Source="Hosting" Target="Logging" />
     <Link Source="Hosting" Target="Options" />
-    <Link Source="Hosting" Target="Testing" />
+    <Link Source="HtmlAbstractions" Target="Common" />
     <Link Source="HtmlAbstractions" Target="DependencyInjection" />
     <Link Source="HtmlAbstractions" Target="Options" />
-    <Link Source="HtmlAbstractions" Target="Testing" />
     <Link Source="HttpAbstractions" Target="Common" />
     <Link Source="HttpAbstractions" Target="DependencyInjection" />
     <Link Source="HttpAbstractions" Target="FileSystem" />
     <Link Source="HttpAbstractions" Target="Logging" />
     <Link Source="HttpAbstractions" Target="Options" />
-    <Link Source="HttpAbstractions" Target="Testing" />
     <Link Source="HttpClientFactory" Target="Common" />
     <Link Source="HttpClientFactory" Target="DependencyInjection" />
     <Link Source="HttpClientFactory" Target="Logging" />
     <Link Source="HttpClientFactory" Target="Options" />
-    <Link Source="HttpClientFactory" Target="Testing" />
+    <Link Source="HttpSysServer" Target="Common" />
     <Link Source="HttpSysServer" Target="Hosting" />
     <Link Source="HttpSysServer" Target="HttpAbstractions" />
     <Link Source="HttpSysServer" Target="Logging" />
-    <Link Source="HttpSysServer" Target="Testing" />
     <Link Source="Identity" Target="BasicMiddleware" />
     <Link Source="Identity" Target="Common" />
     <Link Source="Identity" Target="Configuration" />
@@ -196,10 +188,8 @@
     <Link Source="Identity" Target="Razor" />
     <Link Source="Identity" Target="Security" />
     <Link Source="Identity" Target="StaticFiles" />
-    <Link Source="Identity" Target="Testing" />
     <Link Source="IISIntegration" Target="BasicMiddleware" />
     <Link Source="IISIntegration" Target="Common" />
-    <Link Source="IISIntegration" Target="Configuration" />
     <Link Source="IISIntegration" Target="Hosting" />
     <Link Source="IISIntegration" Target="HttpAbstractions" />
     <Link Source="IISIntegration" Target="HttpSysServer" />
@@ -217,7 +207,6 @@
     <Link Source="JavaScriptServices" Target="StaticFiles" />
     <Link Source="JavaScriptServices" Target="WebSockets" />
     <Link Source="JsonPatch" Target="Common" />
-    <Link Source="JsonPatch" Target="Testing" />
     <Link Source="KestrelHttpServer" Target="Common" />
     <Link Source="KestrelHttpServer" Target="Configuration" />
     <Link Source="KestrelHttpServer" Target="DependencyInjection" />
@@ -225,7 +214,7 @@
     <Link Source="KestrelHttpServer" Target="HttpAbstractions" />
     <Link Source="KestrelHttpServer" Target="Logging" />
     <Link Source="KestrelHttpServer" Target="Options" />
-    <Link Source="KestrelHttpServer" Target="Testing" />
+    <Link Source="Localization" Target="Common" />
     <Link Source="Localization" Target="Configuration" />
     <Link Source="Localization" Target="DependencyInjection" />
     <Link Source="Localization" Target="Hosting" />
@@ -235,12 +224,11 @@
     <Link Source="Localization" Target="Logging" />
     <Link Source="Localization" Target="Options" />
     <Link Source="Localization" Target="Routing" />
-    <Link Source="Localization" Target="Testing" />
+    <Link Source="Logging" Target="Common" />
     <Link Source="Logging" Target="Configuration" />
     <Link Source="Logging" Target="DependencyInjection" />
     <Link Source="Logging" Target="FileSystem" />
     <Link Source="Logging" Target="Options" />
-    <Link Source="Logging" Target="Testing" />
     <Link Source="MetaPackages" Target="BasicMiddleware" />
     <Link Source="MetaPackages" Target="Configuration" />
     <Link Source="MetaPackages" Target="Diagnostics" />
@@ -262,6 +250,7 @@
     <Link Source="MusicStore" Target="MetaPackages" />
     <Link Source="MusicStore" Target="Mvc" />
     <Link Source="MusicStore" Target="MvcPrecompilation" />
+    <Link Source="MusicStore" Target="Razor" />
     <Link Source="MusicStore" Target="Security" />
     <Link Source="MusicStore" Target="Session" />
     <Link Source="MusicStore" Target="StaticFiles" />
@@ -289,7 +278,6 @@
     <Link Source="Mvc" Target="Security" />
     <Link Source="Mvc" Target="Session" />
     <Link Source="Mvc" Target="StaticFiles" />
-    <Link Source="Mvc" Target="Testing" />
     <Link Source="MvcPrecompilation" Target="Common" />
     <Link Source="MvcPrecompilation" Target="Configuration" />
     <Link Source="MvcPrecompilation" Target="Hosting" />
@@ -298,19 +286,17 @@
     <Link Source="MvcPrecompilation" Target="Mvc" />
     <Link Source="MvcPrecompilation" Target="Razor" />
     <Link Source="MvcPrecompilation" Target="Security" />
-    <Link Source="MvcPrecompilation" Target="Testing" />
     <Link Source="Options" Target="Common" />
     <Link Source="Options" Target="Configuration" />
     <Link Source="Options" Target="DependencyInjection" />
+    <Link Source="Proxy" Target="Common" />
     <Link Source="Proxy" Target="Hosting" />
     <Link Source="Proxy" Target="IISIntegration" />
     <Link Source="Proxy" Target="KestrelHttpServer" />
     <Link Source="Proxy" Target="Options" />
-    <Link Source="Proxy" Target="Testing" />
     <Link Source="Proxy" Target="WebSockets" />
     <Link Source="Razor" Target="Common" />
     <Link Source="Razor" Target="HtmlAbstractions" />
-    <Link Source="Razor" Target="Testing" />
     <Link Source="ResponseCaching" Target="Caching" />
     <Link Source="ResponseCaching" Target="Common" />
     <Link Source="ResponseCaching" Target="Hosting" />
@@ -327,7 +313,6 @@
     <Link Source="Routing" Target="KestrelHttpServer" />
     <Link Source="Routing" Target="Logging" />
     <Link Source="Routing" Target="Options" />
-    <Link Source="Routing" Target="Testing" />
     <Link Source="Scaffolding" Target="Common" />
     <Link Source="Scaffolding" Target="Configuration" />
     <Link Source="Scaffolding" Target="DependencyInjection" />
@@ -340,7 +325,6 @@
     <Link Source="Scaffolding" Target="Mvc" />
     <Link Source="Scaffolding" Target="Razor" />
     <Link Source="Scaffolding" Target="StaticFiles" />
-    <Link Source="Scaffolding" Target="Testing" />
     <Link Source="Security" Target="Caching" />
     <Link Source="Security" Target="Common" />
     <Link Source="Security" Target="Configuration" />
@@ -356,7 +340,6 @@
     <Link Source="Security" Target="Logging" />
     <Link Source="Security" Target="Options" />
     <Link Source="Security" Target="StaticFiles" />
-    <Link Source="Security" Target="Testing" />
     <Link Source="ServerTests" Target="BasicMiddleware" />
     <Link Source="ServerTests" Target="Configuration" />
     <Link Source="ServerTests" Target="Hosting" />
@@ -378,20 +361,17 @@
     <Link Source="SignalR" Target="CORS" />
     <Link Source="SignalR" Target="DependencyInjection" />
     <Link Source="SignalR" Target="Diagnostics" />
-    <Link Source="SignalR" Target="EntityFrameworkCore" />
     <Link Source="SignalR" Target="Hosting" />
     <Link Source="SignalR" Target="HttpAbstractions" />
-    <Link Source="SignalR" Target="Identity" />
     <Link Source="SignalR" Target="IISIntegration" />
     <Link Source="SignalR" Target="KestrelHttpServer" />
     <Link Source="SignalR" Target="Logging" />
-    <Link Source="SignalR" Target="Mvc" />
     <Link Source="SignalR" Target="Options" />
     <Link Source="SignalR" Target="Routing" />
     <Link Source="SignalR" Target="Security" />
     <Link Source="SignalR" Target="StaticFiles" />
-    <Link Source="SignalR" Target="Testing" />
     <Link Source="SignalR" Target="WebSockets" />
+    <Link Source="StaticFiles" Target="Common" />
     <Link Source="StaticFiles" Target="FileSystem" />
     <Link Source="StaticFiles" Target="Hosting" />
     <Link Source="StaticFiles" Target="HtmlAbstractions" />
@@ -400,12 +380,13 @@
     <Link Source="StaticFiles" Target="IISIntegration" />
     <Link Source="StaticFiles" Target="KestrelHttpServer" />
     <Link Source="StaticFiles" Target="Logging" />
-    <Link Source="StaticFiles" Target="Testing" />
     <Link Source="WebHooks" Target="Common" />
     <Link Source="WebHooks" Target="Configuration" />
+    <Link Source="WebHooks" Target="Logging" />
     <Link Source="WebHooks" Target="MetaPackages" />
     <Link Source="WebHooks" Target="Mvc" />
     <Link Source="WebHooks" Target="StaticFiles" />
+    <Link Source="WebSockets" Target="Common" />
     <Link Source="WebSockets" Target="Configuration" />
     <Link Source="WebSockets" Target="Diagnostics" />
     <Link Source="WebSockets" Target="Hosting" />
@@ -416,6 +397,5 @@
     <Link Source="WebSockets" Target="Logging" />
     <Link Source="WebSockets" Target="Options" />
     <Link Source="WebSockets" Target="StaticFiles" />
-    <Link Source="WebSockets" Target="Testing" />
   </Links>
 </DirectedGraph>
\ No newline at end of file
diff --git a/modules/Testing b/modules/Testing
deleted file mode 160000
index ca4d393237..0000000000
--- a/modules/Testing
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ca4d393237eac5e34b4159c0327a756e171cb0fd