diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 00000000..ff67960c
--- /dev/null
+++ b/Directory.Build.targets
@@ -0,0 +1,9 @@
+<Project>
+  <Target Name="VSTestIfTestProject">
+    <!-- Change VSTest to call only projects where IsTestProject is defined.
+         This gets defined in Microsoft.NET.Test.Sdk and hence 
+         VSTest is run only on test projects. -->
+    <CallTarget Targets="VSTest" Condition="'$(IsTestProject)' == 'true'" />
+  </Target>
+</Project>
+
diff --git a/after.LLVMSharp.sln.targets b/after.LLVMSharp.sln.targets
new file mode 100644
index 00000000..d4d5db9c
--- /dev/null
+++ b/after.LLVMSharp.sln.targets
@@ -0,0 +1,5 @@
+<Project>
+  <Target Name="VSTest">
+    <MSBuild Projects="@(ProjectReference)" Targets="VSTestIfTestProject" />
+  </Target>
+</Project>