diff --git a/.gitignore b/.gitignore
index af72861ecd..12cc4efd83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,5 @@ node_modules
 *.snk
 .nuget/NuGet.exe
 project.lock.json
-.build
\ No newline at end of file
+.build
+.nuget/
\ No newline at end of file
diff --git a/build/ci-test.common.props b/build/ci-test.common.props
new file mode 100644
index 0000000000..26dae2d417
--- /dev/null
+++ b/build/ci-test.common.props
@@ -0,0 +1,7 @@
+<!-- KoreBuild can discover this file is renamed to universe.props-->
+<Project ToolsVersion="15.0">
+  <PropertyGroup>
+    <!-- VS 2017 aware-packages can use this env variable to swap ProjectReference for PackageReference -->
+    <TestFromPackages>true</TestFromPackages>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/makefile.shade b/makefile.shade
index f62f099339..b2b6932622 100644
--- a/makefile.shade
+++ b/makefile.shade
@@ -121,7 +121,12 @@ var buildTarget = "compile"
 
 #verify-all .pull .change-default-build-target-to-verify .build-all
 
-#ci-test .pull .use-local-coherence .sync-commits .remove-src-folders .change-default-build-target-to-verify .build-all
+#ci-test-env
+   @{
+      Environment.SetEnvironmentVariable("CustomUniverseBeforeCommonProps", Path.Combine(Directory.GetCurrentDirectory(), "build", "ci-test.common.props"));
+   }
+
+#ci-test .ci-test-env .pull .use-local-coherence .sync-commits .remove-src-folders .change-default-build-target-to-verify .build-all
 
 #ci-pull
     @{