diff --git a/test/c++/CMakeLists.txt b/test/c++/CMakeLists.txt
index 7c1b3235..c197e470 100644
--- a/test/c++/CMakeLists.txt
+++ b/test/c++/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Build googletest
+add_subdirectory(gtest EXCLUDE_FROM_ALL)
+
 # Copy h5 files to binary dir
 file(GLOB_RECURSE all_h5_ref_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.ref.h5)
 foreach(file ${all_h5_ref_files})
@@ -12,7 +15,7 @@ foreach(test ${all_tests})
   get_filename_component(test_dir ${test} DIRECTORY)
   add_executable(${test_name} ${test})
   set_property(TARGET ${test_name} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})
-  target_link_libraries(${test_name} app4triqs_c triqs::gtest project_warnings)
+  target_link_libraries(${test_name} app4triqs_c gtest_main project_warnings)
   add_test(NAME ${test_name} COMMAND ${test_name} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})
   # Run clang-tidy if found
   if(CLANG_TIDY_EXECUTABLE)
diff --git a/test/c++/basic.cpp b/test/c++/basic.cpp
index f8866fa7..40ed79dd 100644
--- a/test/c++/basic.cpp
+++ b/test/c++/basic.cpp
@@ -28,5 +28,3 @@ TEST(Toto, H5) { // NOLINT
 
   EXPECT_EQ(a, a2); // NOLINT
 }
-
-MAKE_MAIN; // NOLINT