diff --git a/library/compiler-builtins/tests/divti3.rs b/library/compiler-builtins/tests/divti3.rs
index 7919f8fe396a..4c897896e3df 100644
--- a/library/compiler-builtins/tests/divti3.rs
+++ b/library/compiler-builtins/tests/divti3.rs
@@ -6,5 +6,6 @@
                 test), no_std)]
 
 // FIXME(#137)
-#[cfg(not(target_arch = "mips"))]
+// FIXME(#158)
+#[cfg(not(any(target_arch = "mips"), windows))]
 include!(concat!(env!("OUT_DIR"), "/divti3.rs"));
diff --git a/library/compiler-builtins/tests/modti3.rs b/library/compiler-builtins/tests/modti3.rs
index 62129cd04d3c..191bd9b6f912 100644
--- a/library/compiler-builtins/tests/modti3.rs
+++ b/library/compiler-builtins/tests/modti3.rs
@@ -6,5 +6,6 @@
                 test), no_std)]
 
 // FIXME(#137)
-#[cfg(not(target_arch = "mips"))]
+// FIXME(#158)
+#[cfg(not(any(target_arch = "mips"), windows))]
 include!(concat!(env!("OUT_DIR"), "/modti3.rs"));
diff --git a/library/compiler-builtins/tests/udivmodti4.rs b/library/compiler-builtins/tests/udivmodti4.rs
index 8185ec0e7897..daeb81075d58 100644
--- a/library/compiler-builtins/tests/udivmodti4.rs
+++ b/library/compiler-builtins/tests/udivmodti4.rs
@@ -6,5 +6,6 @@
                 test), no_std)]
 
 // FIXME(#137)
-#[cfg(not(target_arch = "mips"))]
+// FIXME(#158)
+#[cfg(not(any(target_arch = "mips"), windows))]
 include!(concat!(env!("OUT_DIR"), "/udivmodti4.rs"));
diff --git a/library/compiler-builtins/tests/udivti3.rs b/library/compiler-builtins/tests/udivti3.rs
index cefddda8f869..5315f310926a 100644
--- a/library/compiler-builtins/tests/udivti3.rs
+++ b/library/compiler-builtins/tests/udivti3.rs
@@ -6,5 +6,6 @@
                 test), no_std)]
 
 // FIXME(#137)
-#[cfg(not(target_arch = "mips"))]
+// FIXME(#158)
+#[cfg(not(any(target_arch = "mips"), windows))]
 include!(concat!(env!("OUT_DIR"), "/udivti3.rs"));
diff --git a/library/compiler-builtins/tests/umodti3.rs b/library/compiler-builtins/tests/umodti3.rs
index 57e651b2710f..22a4180b375a 100644
--- a/library/compiler-builtins/tests/umodti3.rs
+++ b/library/compiler-builtins/tests/umodti3.rs
@@ -6,5 +6,6 @@
                 test), no_std)]
 
 // FIXME(#137)
-#[cfg(not(target_arch = "mips"))]
+// FIXME(#158)
+#[cfg(not(any(target_arch = "mips"), windows))]
 include!(concat!(env!("OUT_DIR"), "/umodti3.rs"));