diff --git a/clang/lib/Headers/module.map b/clang/lib/Headers/module.map
index 1a1e0e26ca1d..cd18e5efb48b 100644
--- a/clang/lib/Headers/module.map
+++ b/clang/lib/Headers/module.map
@@ -36,10 +36,6 @@ module __compiler_builtins [system] {
     header "stdint.h"
   }
 
-  explicit module tgmath {
-    header "tgmath.h"
-  }
-
   explicit module intel {
     requires x86
 
@@ -136,6 +132,7 @@ module __compiler_builtins [system] {
   }
 
   // FIXME: mm_malloc.h
+  // FIXME: tgmath.h
   // FIXME: unwind.h
 
   explicit module varargs {
diff --git a/clang/test/Modules/compiler_builtins.m b/clang/test/Modules/compiler_builtins.m
index a451e8a7addc..283ff0eefe1c 100644
--- a/clang/test/Modules/compiler_builtins.m
+++ b/clang/test/Modules/compiler_builtins.m
@@ -1,9 +1,6 @@
 // RUN: rm -rf %t
 // RUN: %clang -fsyntax-only -fmodules -fmodule-cache-path %t %s -Xclang -verify
 
-// Note: disable test on MSVC, which doesn't have <complex.h>.
-// REQUIRES: shell
-
 @import __compiler_builtins.float_constants;
 
 float getFltMax() { return FLT_MAX; }