diff --git a/libcxx/test/configs/llvm-libc++-shared-clangcl.cfg.in b/libcxx/test/configs/llvm-libc++-shared-clangcl.cfg.in
--- a/libcxx/test/configs/llvm-libc++-shared-clangcl.cfg.in
+++ b/libcxx/test/configs/llvm-libc++-shared-clangcl.cfg.in
@@ -7,23 +7,23 @@
 runtime_library = '@CMAKE_MSVC_RUNTIME_LIBRARY@'
 
 if runtime_library == '' or runtime_library.endswith('DLL'):
-    crt_lib = 'msvcrt'
+    fms_runtime_lib = 'dll'
     cxx_lib = 'msvcprt'
 else:
-    crt_lib = 'libcmt'
+    fms_runtime_lib = 'static'
     cxx_lib = 'libcpmt'
 
 if (runtime_library == '' and '@uppercase_CMAKE_BUILD_TYPE@' == 'DEBUG') or 'Debug' in runtime_library:
-    dbg_include = ' -D_DEBUG -include set_windows_crt_report_mode.h'
-    crt_lib += 'd'
+    dbg_include = ' -include set_windows_crt_report_mode.h'
+    fms_runtime_lib += '_dbg'
     cxx_lib += 'd'
 
 config.substitutions.append(('%{flags}', '--driver-mode=g++'))
 config.substitutions.append(('%{compile_flags}',
-    '-nostdinc++ -I %{include} -I %{target-include} -I %{libcxx}/test/support -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_STDIO_ISO_WIDE_SPECIFIERS -DNOMINMAX' + dbg_include
+    '-fms-runtime-lib=' + fms_runtime_lib + ' -nostdinc++ -I %{include} -I %{target-include} -I %{libcxx}/test/support -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_STDIO_ISO_WIDE_SPECIFIERS -DNOMINMAX' + dbg_include
 ))
 config.substitutions.append(('%{link_flags}',
-    '-nostdlib -L %%{lib} -lc++ -l%s -l%s -loldnames' % (crt_lib, cxx_lib)
+    '-nostdlib -L %{lib} -lc++ -l' + cxx_lib
 ))
 config.substitutions.append(('%{exec}',
     '%{executor} --execdir %T --prepend_env PATH=%{lib} -- '
diff --git a/libcxx/test/configs/llvm-libc++-shared-no-vcruntime-clangcl.cfg.in b/libcxx/test/configs/llvm-libc++-shared-no-vcruntime-clangcl.cfg.in
--- a/libcxx/test/configs/llvm-libc++-shared-no-vcruntime-clangcl.cfg.in
+++ b/libcxx/test/configs/llvm-libc++-shared-no-vcruntime-clangcl.cfg.in
@@ -8,23 +8,23 @@
 runtime_library = '@CMAKE_MSVC_RUNTIME_LIBRARY@'
 
 if runtime_library == '' or runtime_library.endswith('DLL'):
-    crt_lib = 'msvcrt'
+    fms_runtime_lib = 'dll'
     cxx_lib = 'msvcprt'
 else:
-    crt_lib = 'libcmt'
+    fms_runtime_lib = 'static'
     cxx_lib = 'libcpmt'
 
 if (runtime_library == '' and '@uppercase_CMAKE_BUILD_TYPE@' == 'DEBUG') or 'Debug' in runtime_library:
-    dbg_include = ' -D_DEBUG -include set_windows_crt_report_mode.h'
-    crt_lib += 'd'
+    dbg_include = ' -include set_windows_crt_report_mode.h'
+    fms_runtime_lib += '_dbg'
     cxx_lib += 'd'
 
 config.substitutions.append(('%{flags}', '--driver-mode=g++'))
 config.substitutions.append(('%{compile_flags}',
-    '-nostdinc++ -I %{include} -I %{target-include} -I %{libcxx}/test/support -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_STDIO_ISO_WIDE_SPECIFIERS -DNOMINMAX -D_HAS_EXCEPTIONS=0' + dbg_include
+    '-fms-runtime-lib=' + fms_runtime_lib + ' -nostdinc++ -I %{include} -I %{target-include} -I %{libcxx}/test/support -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_STDIO_ISO_WIDE_SPECIFIERS -DNOMINMAX -D_HAS_EXCEPTIONS=0' + dbg_include
 ))
 config.substitutions.append(('%{link_flags}',
-    '-nostdlib -L %%{lib} -lc++ -l%s -l%s -loldnames' % (crt_lib, cxx_lib)
+    '-nostdlib -L %{lib} -lc++ -l' + cxx_lib
 ))
 config.substitutions.append(('%{exec}',
     '%{executor} --execdir %T --prepend_env PATH=%{lib} -- '
diff --git a/libcxx/test/configs/llvm-libc++-static-clangcl.cfg.in b/libcxx/test/configs/llvm-libc++-static-clangcl.cfg.in
--- a/libcxx/test/configs/llvm-libc++-static-clangcl.cfg.in
+++ b/libcxx/test/configs/llvm-libc++-static-clangcl.cfg.in
@@ -7,23 +7,23 @@
 runtime_library = '@CMAKE_MSVC_RUNTIME_LIBRARY@'
 
 if runtime_library == '' or runtime_library.endswith('DLL'):
-    crt_lib = 'msvcrt'
+    fms_runtime_lib = 'dll'
     cxx_lib = 'msvcprt'
 else:
-    crt_lib = 'libcmt'
+    fms_runtime_lib = 'static'
     cxx_lib = 'libcpmt'
 
 if (runtime_library == '' and '@uppercase_CMAKE_BUILD_TYPE@' == 'DEBUG') or 'Debug' in runtime_library:
-    dbg_include = ' -D_DEBUG -include set_windows_crt_report_mode.h'
-    crt_lib += 'd'
+    dbg_include = ' -include set_windows_crt_report_mode.h'
+    fms_runtime_lib += '_dbg'
     cxx_lib += 'd'
 
 config.substitutions.append(('%{flags}', '--driver-mode=g++'))
 config.substitutions.append(('%{compile_flags}',
-    '-nostdinc++ -I %{include} -I %{target-include} -I %{libcxx}/test/support -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_STDIO_ISO_WIDE_SPECIFIERS -DNOMINMAX' + dbg_include
+    '-fms-runtime-lib=' + fms_runtime_lib + ' -nostdinc++ -I %{include} -I %{target-include} -I %{libcxx}/test/support -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_STDIO_ISO_WIDE_SPECIFIERS -DNOMINMAX' + dbg_include
 ))
 config.substitutions.append(('%{link_flags}',
-    '-nostdlib -L %%{lib} -llibc++ -l%s -l%s -loldnames' % (crt_lib, cxx_lib)
+    '-nostdlib -L %{lib} -llibc++ -l' + cxx_lib
 ))
 config.substitutions.append(('%{exec}',
     '%{executor} --execdir %T -- '