Index: test-suite/trunk/CMakeLists.txt
===================================================================
--- test-suite/trunk/CMakeLists.txt
+++ test-suite/trunk/CMakeLists.txt
@@ -212,8 +212,7 @@
   foreach(entry ${sub_cmakelists})
     get_filename_component(subdir ${entry} DIRECTORY)
 	 # Exclude tools and CTMark from default list
-    if(NOT ${subdir} STREQUAL tools AND NOT ${subdir} STREQUAL CTMark
-       AND NOT ${subdir} STREQUAL MicroBenchmarks)
+    if(NOT ${subdir} STREQUAL tools AND NOT ${subdir} STREQUAL CTMark)
       list(APPEND TEST_SUITE_SUBDIRS ${subdir})
     endif()
   endforeach()
Index: test-suite/trunk/MicroBenchmarks/CMakeLists.txt
===================================================================
--- test-suite/trunk/MicroBenchmarks/CMakeLists.txt
+++ test-suite/trunk/MicroBenchmarks/CMakeLists.txt
@@ -1,5 +1,7 @@
-file(COPY lit.local.cfg DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+if(NOT DEFINED DISABLE_CXX)
+  file(COPY lit.local.cfg DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
-add_subdirectory(libs)
-add_subdirectory(XRay)
-add_subdirectory(LCALS)
+  add_subdirectory(libs)
+  add_subdirectory(XRay)
+  add_subdirectory(LCALS)
+endif()
Index: test-suite/trunk/MicroBenchmarks/libs/CMakeLists.txt
===================================================================
--- test-suite/trunk/MicroBenchmarks/libs/CMakeLists.txt
+++ test-suite/trunk/MicroBenchmarks/libs/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(CMAKE_CXX_STANDARD 11)
+set(HAVE_STD_REGEX 1)
 add_subdirectory(benchmark-1.3.0)
 test_suite_add_build_dependencies(benchmark)
 test_suite_add_build_dependencies(output_test_helper)