diff --git a/MicroBenchmarks/libs/CMakeLists.txt b/MicroBenchmarks/libs/CMakeLists.txt
--- a/MicroBenchmarks/libs/CMakeLists.txt
+++ b/MicroBenchmarks/libs/CMakeLists.txt
@@ -5,10 +5,15 @@
 # When enforcing c++11 we need to disable one of the benchmark library's tests
 set(BENCHMARK_HAS_CXX03_FLAG 0)
 
-# Disable benchmark's test targets, to avoid needing to add
-# `test_suite_add_build_dependencies` for them as they evolve upstream.
-# `benchmark` is the only target we actually need.
-set(BENCHMARK_ENABLE_TESTING Off)
 add_subdirectory(benchmark)
 test_suite_add_build_dependencies(benchmark)
+test_suite_add_build_dependencies(output_test_helper)
+test_suite_add_build_dependencies(gtest)
+test_suite_add_build_dependencies(gmock)
+
+# These tests, when built with BENCHMARK_ENABLE_ASSEMBLY_TESTS is on.
+# They don't depend on the above, so we need to list them explicitly.
+test_suite_add_build_dependencies(donotoptimize_assembly_test)
+test_suite_add_build_dependencies(state_assembly_test)
+test_suite_add_build_dependencies(clobber_memory_assembly_test)