diff --git a/src/Servers/Kestrel.sln b/src/Servers/Kestrel.sln
index 003555e8ba7c..557457abd58a 100644
--- a/src/Servers/Kestrel.sln
+++ b/src/Servers/Kestrel.sln
@@ -57,6 +57,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Libuv.BindTests", "Kestrel\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sockets.BindTests", "Kestrel\test\Sockets.BindTests\Sockets.BindTests.csproj", "{F254FDB7-6997-4894-9E82-C4583F605394}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C1703959-147D-45A2-B43A-E2FDD6BE1EDC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SystemdActivation", "SystemdActivation", "{3CAC9760-6D6E-424C-AC49-E60118D8ADD4}"
+	ProjectSection(SolutionItems) = preProject
+		Kestrel\test\SystemdActivation\docker-entrypoint.sh = Kestrel\test\SystemdActivation\docker-entrypoint.sh
+		Kestrel\test\SystemdActivation\docker.sh = Kestrel\test\SystemdActivation\docker.sh
+		Kestrel\test\SystemdActivation\Dockerfile = Kestrel\test\SystemdActivation\Dockerfile
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E493A405-D2D3-404E-81CA-00E8D9AD5807}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -360,6 +371,12 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{710E0641-FFF4-4994-A7FA-B22A550A8F20} = {E493A405-D2D3-404E-81CA-00E8D9AD5807}
+		{5F6D1661-652E-4DF3-8A81-6EBE4208CE1A} = {E493A405-D2D3-404E-81CA-00E8D9AD5807}
+		{AA10418F-3291-4011-8BF5-84F315F472B5} = {C1703959-147D-45A2-B43A-E2FDD6BE1EDC}
+		{1C342888-3514-4ECE-9820-1C7BD59EA29F} = {E493A405-D2D3-404E-81CA-00E8D9AD5807}
+		{051BE5E3-073C-4CD2-92AB-7742B2931409} = {E493A405-D2D3-404E-81CA-00E8D9AD5807}
+		{B46DA84E-8442-4988-9B43-6A83812A35B7} = {C1703959-147D-45A2-B43A-E2FDD6BE1EDC}
 		{0730A71E-CC07-4445-AC56-606B59BBF51F} = {40FEAA2F-DDF0-4FA3-942A-0D39B722DDE7}
 		{4641895A-5E44-4158-91C9-B3718398229E} = {40FEAA2F-DDF0-4FA3-942A-0D39B722DDE7}
 		{B5C4C2EA-5439-457D-9487-924A42E4D74D} = {F826BA61-60A9-45B6-AF29-FD1A6E313EF0}
@@ -367,7 +384,18 @@ Global
 		{0710F560-A741-4139-BC1F-BFF1895F1274} = {F826BA61-60A9-45B6-AF29-FD1A6E313EF0}
 		{F9D090D2-0568-403D-ADBA-9E079397B584} = {F826BA61-60A9-45B6-AF29-FD1A6E313EF0}
 		{01D031FC-61A5-45BD-BE11-57FA00BE1BCD} = {F826BA61-60A9-45B6-AF29-FD1A6E313EF0}
+		{3CCA24C1-04AC-48C0-A60A-D43FE7479529} = {C1703959-147D-45A2-B43A-E2FDD6BE1EDC}
+		{28DD5565-0546-48B0-973A-B27E1C9AD032} = {C1703959-147D-45A2-B43A-E2FDD6BE1EDC}
 		{3615A580-A595-4B64-A8C7-FD361E712BEA} = {0256853E-1FDA-45C6-9641-87306D378508}
+		{FB1A66FE-1CB9-4121-A9F7-1A1459D3C9CC} = {E493A405-D2D3-404E-81CA-00E8D9AD5807}
+		{551F655B-F33C-4CD6-851F-4DFB89FA96A0} = {E493A405-D2D3-404E-81CA-00E8D9AD5807}
+		{6716895A-A00E-4BAC-92DF-4F8C859BC51E} = {C1703959-147D-45A2-B43A-E2FDD6BE1EDC}
+		{C0AB577F-0227-45E6-A3AC-E7ABEFC4ED60} = {E493A405-D2D3-404E-81CA-00E8D9AD5807}
+		{C606C348-2232-4431-98F3-998B22792A38} = {C1703959-147D-45A2-B43A-E2FDD6BE1EDC}
+		{75C0BD33-80E2-4061-A778-08C1FBECEA7D} = {C1703959-147D-45A2-B43A-E2FDD6BE1EDC}
+		{0358D319-1D91-4EDE-A424-6A26734B32CB} = {C1703959-147D-45A2-B43A-E2FDD6BE1EDC}
+		{F254FDB7-6997-4894-9E82-C4583F605394} = {C1703959-147D-45A2-B43A-E2FDD6BE1EDC}
+		{3CAC9760-6D6E-424C-AC49-E60118D8ADD4} = {C1703959-147D-45A2-B43A-E2FDD6BE1EDC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {48207B50-7D05-4B10-B585-890FE0F4FCE1}
diff --git a/src/Servers/Kestrel/shared/src/ThrowHelper.cs b/src/Servers/Kestrel/Core/src/Internal/ThrowHelper.cs
similarity index 100%
rename from src/Servers/Kestrel/shared/src/ThrowHelper.cs
rename to src/Servers/Kestrel/Core/src/Internal/ThrowHelper.cs
diff --git a/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj b/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj
index 0eeffec460e9..90d916537e6b 100644
--- a/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj
+++ b/src/Servers/Kestrel/Core/src/Microsoft.AspNetCore.Server.Kestrel.Core.csproj
@@ -9,10 +9,6 @@
     <NoWarn>CS1591;$(NoWarn)</NoWarn>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="$(KestrelSharedSourceRoot)src\ThrowHelper.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Certificates.Generation.Sources" PrivateAssets="All" />
     <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
diff --git a/src/Servers/Kestrel/Transport.Abstractions/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj b/src/Servers/Kestrel/Transport.Abstractions/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj
index e9ba395baf39..e6d51dac8f05 100644
--- a/src/Servers/Kestrel/Transport.Abstractions/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj
+++ b/src/Servers/Kestrel/Transport.Abstractions/src/Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.csproj
@@ -11,7 +11,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="$(KestrelSharedSourceRoot)src\ThrowHelper.cs" />
     <Compile Include="$(RepositoryRoot)src\Shared\Buffers.MemoryPool\*.cs" />
   </ItemGroup>