diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a5c045c..fb897a9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -72,7 +72,7 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --manifest-path=${{ matrix.manifest }} -- --nocapture
+          args: --target=${{ matrix.rust_target }} --manifest-path=${{ matrix.manifest }} -- --nocapture
         env:
           CC: ${{ matrix.clang_cl }}
 
diff --git a/psm/build.rs b/psm/build.rs
index 07baeb8..01a13bf 100644
--- a/psm/build.rs
+++ b/psm/build.rs
@@ -36,7 +36,6 @@ fn find_assembly(
         }
         ("x86", _, "windows", _) => Some(("src/arch/x86_windows_gnu.s", false)),
         ("x86_64", _, "windows", _) => Some(("src/arch/x86_64_windows_gnu.s", false)),
-
         ("x86", _, _, _) => Some(("src/arch/x86.s", true)),
         ("x86_64", _, _, _) => Some(("src/arch/x86_64.s", true)),
         ("arm", _, _, _) => Some(("src/arch/arm_aapcs.s", true)),
@@ -74,15 +73,7 @@ fn main() {
 
     let mut cfg = cc::Build::new();
     let msvc = cfg.get_compiler().is_like_msvc();
-    let clang_cl = cfg
-        .get_compiler()
-        .path()
-        .file_name()
-        .and_then(|f| f.to_str())
-        .map(|f| f.contains("clang-cl"))
-        .unwrap_or(false);
-    let masm = msvc && !clang_cl;
-    let asm = if let Some((asm, canswitch)) = find_assembly(&arch, &endian, &os, &env, masm) {
+    let asm = if let Some((asm, canswitch)) = find_assembly(&arch, &endian, &os, &env, msvc) {
         println!("cargo:rustc-cfg=asm");
         if canswitch {
             println!("cargo:rustc-cfg=switchable_stack")