diff --git a/build/Helpers.lua b/build/Helpers.lua
index 40e519d8..ecdb1d46 100644
--- a/build/Helpers.lua
+++ b/build/Helpers.lua
@@ -135,11 +135,15 @@ function SetupNativeProject()
     buildoptions { msvc_buildflags }
     defines { msvc_cpp_defines }
 
+    if os.getenv("CI") then
+      toolset "clang"
+    end
+
   filter { "system:linux" }
     buildoptions { gcc_buildflags }
     links { "stdc++" }
 
-  filter { "toolset:clang", "system:not macosx" }
+  filter { "toolset:clang", "system:linux" }
     linkoptions { "-fuse-ld=/usr/bin/ld.lld" }
 
   filter { "system:macosx", "language:C++" }
diff --git a/src/CppParser/Bindings/CLI/premake5.lua b/src/CppParser/Bindings/CLI/premake5.lua
index f0dcd194..9cdcaa93 100644
--- a/src/CppParser/Bindings/CLI/premake5.lua
+++ b/src/CppParser/Bindings/CLI/premake5.lua
@@ -13,6 +13,7 @@ project "CppSharp.Parser.CLI"
 
   filter "action:vs*"
     buildoptions { clang_msvc_flags }  
+    toolset "msc"
 
   filter {}