diff --git a/build/repo.targets b/build/repo.targets
new file mode 100644
index 0000000000..b20cfcf4e7
--- /dev/null
+++ b/build/repo.targets
@@ -0,0 +1,7 @@
+<Project>
+  <Target Name="TestNano" DependsOnTargets="Restore">
+    <MSBuild Targets="VSTest"
+             Projects="$(MSBuildThisFileDirectory)..\test\E2ETests\E2ETests.csproj"
+             Properties="Configuration=$(Configuration);VSTestLogger=trx;VSTestTestCaseFilter=E2ETests=NanoServer" />
+  </Target>
+</Project>
diff --git a/makefile.shade b/makefile.shade
index 1b9f56e474..79865bf9e8 100644
--- a/makefile.shade
+++ b/makefile.shade
@@ -1,8 +1,7 @@
 use-standard-lifecycle
 k-standard-goals
 
-#run-nano-tests .initialize
+#run-nano-tests
     @{
-        var e2eTestsDirectory = Path.Combine(Directory.GetCurrentDirectory(), "test", "E2ETests");
-        Dotnet("test --logger:trx --filter E2ETests=NanoServer --configuration " + E("Configuration"), e2eTestsDirectory);
+        MSBuild("/t:TestNano");
     }
\ No newline at end of file
diff --git a/samples/MusicStore/runtimeconfig.template.json b/samples/MusicStore/runtimeconfig.template.json
deleted file mode 100644
index 7305508a37..0000000000
--- a/samples/MusicStore/runtimeconfig.template.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "configProperties": {
-    "System.GC.Server": true
-  }
-}
\ No newline at end of file
diff --git a/test/E2ETests/E2ETests.csproj b/test/E2ETests/E2ETests.csproj
index 284d235fdb..3f65692719 100644
--- a/test/E2ETests/E2ETests.csproj
+++ b/test/E2ETests/E2ETests.csproj
@@ -6,6 +6,7 @@
     <TargetFramework>netcoreapp1.1</TargetFramework>
     <UserSecretsId>MusicStore.E2ETests</UserSecretsId>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <ServerGarbageCollection>true</ServerGarbageCollection>
     <RuntimeIdentifiers>win7-x86;win7-x64;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.14.10-x64;ubuntu.15.04-x64;ubuntu.16.04-x64;centos.7-x64;debian.8-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
diff --git a/test/E2ETests/Properties/AssemblyInfo.cs b/test/E2ETests/Properties/AssemblyInfo.cs
index b1fa884228..f1d5d77ca8 100644
--- a/test/E2ETests/Properties/AssemblyInfo.cs
+++ b/test/E2ETests/Properties/AssemblyInfo.cs
@@ -1,3 +1,3 @@
 using Xunit;
 
-[assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly)]
\ No newline at end of file
+[assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly)]
diff --git a/test/MusicStore.Test/MusicStore.Test.csproj b/test/MusicStore.Test/MusicStore.Test.csproj
index 67f42c19a3..0ee99ce77a 100644
--- a/test/MusicStore.Test/MusicStore.Test.csproj
+++ b/test/MusicStore.Test/MusicStore.Test.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp1.1;net451</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OS)'!='Windows_NT'">netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp1.1</TargetFrameworks>
     <RuntimeIdentifier Condition="'$(TargetFramework)'!='netcoreapp1.1'">win7-x64</RuntimeIdentifier>
   </PropertyGroup>