diff --git a/test/gtest/CMakeLists.txt b/test/gtest/CMakeLists.txt
index 8db86712bba..0953df45247 100644
--- a/test/gtest/CMakeLists.txt
+++ b/test/gtest/CMakeLists.txt
@@ -37,18 +37,11 @@ set(unittest_SOURCES
   type-builder.cpp
   wat-lexer.cpp
   validator.cpp
+  source-map.cpp
 )
 
 if(BUILD_FUZZTEST)
   set(unittest_SOURCES ${unittest_SOURCES} type-domains.cpp)
-else()
-  # source-map.cpp uses the gmock-matchers.h header, which is included with the
-  # "standard" upstream gtest library, but not with the one bundled into the
-  # fuzztest library (and the gmock included with upstream gtest seems
-  # incompatible with the one in fuzztest). For now we work around this by just
-  # excluding source-map.cpp from the fuzztest build, but if we start using
-  # gmock more we should figure out what the right way to hande this is.
-  set(unittest_SOURCES ${unittest_SOURCES} source-map.cpp)
 endif()
 
 # suffix_tree.cpp includes LLVM header using std::iterator (deprecated in C++17)
@@ -61,6 +54,7 @@ include(GoogleTest)
 binaryen_add_executable(binaryen-unittests "${unittest_SOURCES}")
 if(BUILD_FUZZTEST)
   link_fuzztest(binaryen-unittests)
+  target_link_libraries(binaryen-unittests PRIVATE gmock)
   gtest_discover_tests(binaryen-unittests)
 else()
   target_link_libraries(binaryen-unittests PRIVATE gtest gtest_main)