diff --git a/test/Templates.Test.Common/Templates.Test.Common.csproj b/test/Templates.Test.Common/Templates.Test.Common.csproj
index 8154ab5..006d1e6 100644
--- a/test/Templates.Test.Common/Templates.Test.Common.csproj
+++ b/test/Templates.Test.Common/Templates.Test.Common.csproj
@@ -25,8 +25,4 @@
       <_Parameter2>$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))dotnet-ef/$(DotnetEfPackageVersion)/tools/netcoreapp3.0/any/dotnet-ef.dll</_Parameter2>
     </AssemblyAttribute>
   </ItemGroup>
-
-  <ItemGroup>
-    <Compile Remove="Infrastructure/**/*.cs" />
-  </ItemGroup>
 </Project>
diff --git a/test/Templates.Test.SpaTemplateTest/SpaTemplateTestBase.cs b/test/Templates.Test.SpaTemplateTest/SpaTemplateTestBase.cs
index 0085fb2..953e81e 100644
--- a/test/Templates.Test.SpaTemplateTest/SpaTemplateTestBase.cs
+++ b/test/Templates.Test.SpaTemplateTest/SpaTemplateTestBase.cs
@@ -13,7 +13,7 @@ using Xunit.Abstractions;
 #if EDGE
 [assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly)]
 #endif
-[assembly: TestFramework("Templates.Test.Helpers.XunitExtensions.XunitTestFrameworkWithAssemblyFixture", "Templates.Test.SpaTemplateTest")]
+[assembly: TestFramework("Templates.Test.Helpers.XunitExtensions.XunitTestFrameworkWithAssemblyFixture", "Templates.Test.Common")]
 namespace Templates.Test.SpaTemplateTest
 {
     public class SpaTemplateTestBase : BrowserTestBase
diff --git a/test/Templates.Test.SpaTemplateTest/Templates.Test.SpaTemplateTest.csproj b/test/Templates.Test.SpaTemplateTest/Templates.Test.SpaTemplateTest.csproj
index a5b5c4b..4ecbe4a 100644
--- a/test/Templates.Test.SpaTemplateTest/Templates.Test.SpaTemplateTest.csproj
+++ b/test/Templates.Test.SpaTemplateTest/Templates.Test.SpaTemplateTest.csproj
@@ -20,9 +20,4 @@
   <ItemGroup>
     <ProjectReference Include="../Templates.Test.Common/Templates.Test.Common.csproj" />
   </ItemGroup>
-
-  <ItemGroup>
-    <!-- For some reason xunit doesn't work if the Fixture stuff isn't in the same project as the tests. -->
-    <Compile Include="../Templates.Test.Common/Infrastructure/**/*.cs" />
-  </ItemGroup>  
 </Project>
diff --git a/test/Templates.Test/MvcTemplateTest.cs b/test/Templates.Test/MvcTemplateTest.cs
index 98da8c6..2ede26a 100644
--- a/test/Templates.Test/MvcTemplateTest.cs
+++ b/test/Templates.Test/MvcTemplateTest.cs
@@ -12,7 +12,7 @@ using Xunit.Abstractions;
 #if EDGE
 [assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly)]
 #endif
-[assembly: TestFramework("Templates.Test.Helpers.XunitExtensions.XunitTestFrameworkWithAssemblyFixture", "Templates.Test")]
+[assembly: TestFramework("Templates.Test.Helpers.XunitExtensions.XunitTestFrameworkWithAssemblyFixture", "Templates.Test.Common")]
 namespace Templates.Test
 {
     public class MvcTemplateTest : BrowserTestBase
diff --git a/test/Templates.Test/Templates.Test.csproj b/test/Templates.Test/Templates.Test.csproj
index 8be64b9..028ac5e 100644
--- a/test/Templates.Test/Templates.Test.csproj
+++ b/test/Templates.Test/Templates.Test.csproj
@@ -25,9 +25,4 @@
   <ItemGroup>
     <ProjectReference Include="../Templates.Test.Common/Templates.Test.Common.csproj" />
   </ItemGroup>
-
-  <ItemGroup>
-    <!-- For some reason xunit doesn't work if the Fixture stuff isn't in the same project as the tests. -->
-    <Compile Include="../Templates.Test.Common/Infrastructure/**/*.cs" />
-  </ItemGroup>
 </Project>