Index: compiler-rt/trunk/test/fuzzer/lit.cfg.py
===================================================================
--- compiler-rt/trunk/test/fuzzer/lit.cfg.py
+++ compiler-rt/trunk/test/fuzzer/lit.cfg.py
@@ -66,10 +66,8 @@
   compiler_cmd = config.clang
   extra_cmd = config.target_flags
 
-  if is_cpp and 'windows-msvc' in config.target_triple:
-    std_cmd = '--driver-mode=cl'
-  elif is_cpp:
-    std_cmd = '--driver-mode=g++ -std=c++11'
+  if is_cpp:
+    std_cmd = '--driver-mode=g++'
   else:
     std_cmd = ''
 
Index: compiler-rt/trunk/test/fuzzer/windows-opt-ref.test
===================================================================
--- compiler-rt/trunk/test/fuzzer/windows-opt-ref.test
+++ compiler-rt/trunk/test/fuzzer/windows-opt-ref.test
@@ -1,7 +1,7 @@
 REQUIRES: windows
 // Verify that the linker eliminating unreferenced functions (/OPT:REF) does not
 // strip sancov module constructor.
-RUN: %cpp_compiler %S/SimpleCmpTest.cpp -o %t-SimpleCmpTest /link /OPT:REF
+RUN: %cpp_compiler %S/SimpleCmpTest.cpp -o %t-SimpleCmpTest -Wl,-OPT:REF
 
 RUN: not %run %t-SimpleCmpTest -seed=1 -runs=100000000 2>&1 | FileCheck %s