diff --git a/build.fsx b/build.fsx
index 1e91c58a..fa3201f7 100644
--- a/build.fsx
+++ b/build.fsx
@@ -395,8 +395,43 @@ Target "OpenBlasWinBuild" DoNothing
 // TEST
 // --------------------------------------------------------------------------------------
 
-Target "Test" (fun _ -> test !! "out/test/**/*UnitTests*.dll")
-"Build" ==> "Test"
+let testLibrary testsDir testsProj framework =
+    DotNetCli.RunCommand
+        (fun c -> { c with WorkingDir = testsDir})
+        (sprintf "run -p %s --configuration Release --framework %s"
+            testsProj
+            framework)
+
+Target "Test" DoNothing
+Target "TestF#" DoNothing
+Target "TestC#" DoNothing
+
+Target "TestC#Core1.1" (fun _ -> testLibrary "src/UnitTests" "UnitTests.csproj" "netcoreapp1.1")
+Target "TestC#Core2.0" DoNothing
+Target "TestC#NET40" DoNothing
+Target "TestC#NET45" DoNothing
+Target "TestC#NET46" DoNothing
+Target "TestC#NET47" DoNothing
+
+Target "TestF#Core1.1" DoNothing
+Target "TestF#Core2.0" DoNothing
+Target "TestF#NET45" DoNothing
+Target "TestF#NET46" DoNothing
+Target "TestF#NET47" DoNothing
+
+"Build" ==> "TestF#Core1.1" ==> "TestF#"
+"Build" ==> "TestF#Core2.0" ==> "TestF#"
+"Build" ==> "TestF#NET45" ==> "TestF#"
+"Build" ==> "TestF#NET46" ==> "TestF#"
+"Build" ==> "TestF#NET47" ==> "TestF#"
+"Build" ==> "TestC#Core1.1" ==> "TestC#"
+"Build" ==> "TestC#Core2.0" ==> "TestC#"
+"Build" ==> "TestC#NET40" ==> "TestC#"
+"Build" ==> "TestC#NET45" ==> "TestC#"
+"Build" ==> "TestC#NET46" ==> "TestC#"
+"Build" ==> "TestC#NET47" ==> "TestC#"
+"TestC#" ==> "Test"
+"TestF#" ==> "Test"
 
 Target "DataTest" (fun _ -> test !! "out/Data/test/**/*UnitTests*.dll")
 "DataBuild" ==> "DataTest"