diff --git a/tests/test_coreclr.csproj b/tests/test_coreclr.csproj
index 5538b5e25..345d330b3 100644
--- a/tests/test_coreclr.csproj
+++ b/tests/test_coreclr.csproj
@@ -18,11 +18,9 @@
     <Move SourceFiles="$([System.String]::Copy('%(Bak.Identity)'))" DestinationFiles="$([System.String]::Copy('%(Bak.Identity)').Replace('.csproj.bak', '.csproj'))" />
   </Target>
 
-  <Target Name="Build">
+  <Target Name="Build" DependsOnTargets="ExeTest;NUnitTest" />
 
-
-    <!--Exe tests-->
-    
+  <Target Name="ExeTest" Outputs="%(Exe.Identity)">
     <Exec
         Command="dotnet restore $([System.IO.Path]::GetFileName(%(Exe.Identity)))"
         WorkingDirectory="$([System.IO.Path]::GetDirectoryName(%(Exe.Identity)))"
@@ -32,9 +30,27 @@
         Command="dotnet run -p $([System.IO.Path]::GetFileName(%(Exe.Identity)))"
         WorkingDirectory="$([System.IO.Path]::GetDirectoryName(%(Exe.Identity)))"
         ContinueOnError="false" />
+  </Target>
+
+  <Target Name="NUnitTest" Outputs="%(Test.Identity)" DependsOnTargets="NUnitTestInit">
+    <MakeDir Directories="$(TestResultDir)/$([System.IO.Path]::GetFileNameWithoutExtension(%(Test.Identity)))"
+             ContinueOnError="true" />
 
-    <!--nUnit tests-->
+    <Exec
+        Command="dotnet restore $([System.IO.Path]::GetFileName(%(Test.Identity)))"
+        WorkingDirectory="$([System.IO.Path]::GetDirectoryName(%(Test.Identity)))"
+        ContinueOnError="false"/>
+    <Exec
+        Command="dotnet build -c Release $([System.IO.Path]::GetFileName(%(Test.Identity)))"
+        WorkingDirectory="$([System.IO.Path]::GetDirectoryName(%(Test.Identity)))"
+        ContinueOnError="true" />
+    <Exec
+        Command="dotnet $(MetaRunner) $(TestRunner) $(TestResultDir)/$([System.IO.Path]::GetFileNameWithoutExtension(%(Test.Identity))) bin/Release/netcoreapp2.0/$([System.IO.Path]::GetFileNameWithoutExtension(%(Test.Identity))).dll --workers=1 --timeout=1800000"
+        WorkingDirectory="$([System.IO.Path]::GetDirectoryName(%(Test.Identity)))"
+        ContinueOnError="true" Condition="Exists('$([System.IO.Path]::GetDirectoryName(%(Test.Identity)))/bin/Release/netcoreapp2.0/$([System.IO.Path]::GetFileNameWithoutExtension(%(Test.Identity))).dll')"/>
+  </Target>
 
+  <Target Name="NUnitTestInit">
     <Exec
         Command="dotnet restore"
         WorkingDirectory="nunit_tools/nunit_test_runner"
@@ -55,20 +71,6 @@
 
     <RemoveDir Directories="$(TestResultDir)" ContinueOnError="true" />
     <MakeDir Directories="$(TestResultDir)" ContinueOnError="true" />
-    <MakeDir Directories="$(TestResultDir)/$([System.IO.Path]::GetFileNameWithoutExtension(%(Test.Identity)))"
-             ContinueOnError="true" />
-
-    <Exec
-        Command="dotnet restore $([System.IO.Path]::GetFileName(%(Test.Identity)))"
-        WorkingDirectory="$([System.IO.Path]::GetDirectoryName(%(Test.Identity)))"
-        ContinueOnError="false"/>
-    <Exec
-        Command="dotnet build -c Release $([System.IO.Path]::GetFileName(%(Test.Identity)))"
-        WorkingDirectory="$([System.IO.Path]::GetDirectoryName(%(Test.Identity)))"
-        ContinueOnError="true" />
-    <Exec
-        Command="dotnet $(MetaRunner) $(TestRunner) $(TestResultDir)/$([System.IO.Path]::GetFileNameWithoutExtension(%(Test.Identity))) bin/Release/netcoreapp2.0/$([System.IO.Path]::GetFileNameWithoutExtension(%(Test.Identity))).dll --workers=1 --timeout=1800000"
-        WorkingDirectory="$([System.IO.Path]::GetDirectoryName(%(Test.Identity)))"
-        ContinueOnError="true" Condition="Exists('$([System.IO.Path]::GetDirectoryName(%(Test.Identity)))/bin/Release/netcoreapp2.0/$([System.IO.Path]::GetFileNameWithoutExtension(%(Test.Identity))).dll')"/>
   </Target>
+
 </Project>