diff --git a/services/tunnelbroker/CMakeLists.txt b/services/tunnelbroker/CMakeLists.txt
index ab9584c23..ad9b8739c 100644
--- a/services/tunnelbroker/CMakeLists.txt
+++ b/services/tunnelbroker/CMakeLists.txt
@@ -1,164 +1,168 @@
 PROJECT(tunnelbroker C CXX)
 
 cmake_minimum_required(VERSION 3.16)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY bin)
 
 if(COMMAND cmake_policy)
   cmake_policy(SET CMP0003 NEW)
 endif(COMMAND cmake_policy)
 
 set(CMAKE_CXX_STANDARD 17)
 # For C++17 on MacOS, we must set minimum target to 10.14+
 set(CMAKE_OSX_DEPLOYMENT_TARGET 10.14)
 
 find_package(PkgConfig REQUIRED)
 
 find_package(double-conversion REQUIRED)
 find_package(Folly REQUIRED)
 find_package(protobuf REQUIRED)
 find_package(gRPC REQUIRED)
 
 # Find AMQP-CPP installation
 find_package(amqpcpp CONFIG REQUIRED)
 
 # Find Cryptopp installation
 pkg_check_modules(CRYPTOPP
   REQUIRED
   IMPORTED_TARGET
   libcryptopp=8.6
 )
 
 # Find Libuv installation
 pkg_check_modules(LIBUV
   REQUIRED
   IMPORTED_TARGET
   libuv>=1.43
 )
 
 if(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL "/transferred/tunnelbroker")
   # Inside the docker build contex
   set(_proto_path "grpc")
 else()
   # Inside repo
   set(_proto_path "../../native/cpp/CommonCpp/grpc")
 endif()
 
 # Shared Comm protos
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/${_proto_path}
   ${CMAKE_CURRENT_BINARY_DIR}/protos
   EXCLUDE_FROM_ALL
 )
 
 # Shared services code
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../lib/src
   ${CMAKE_CURRENT_BINARY_DIR}/common
   EXCLUDE_FROM_ALL
 )
 
 set(BUILD_TESTING OFF CACHE BOOL "Turn off tests" FORCE)
 set(WITH_GFLAGS OFF CACHE BOOL "Turn off gflags" FORCE)
 
 find_package(AWSSDK REQUIRED COMPONENTS core dynamodb)
 find_package(Boost 1.40
   COMPONENTS program_options thread system context filesystem regex
   REQUIRED
 )
 find_package(OpenSSL REQUIRED)
 find_package(glog)
 
 # Corrosion Rust integration
 find_package(Corrosion REQUIRED)
 corrosion_import_crate(MANIFEST_PATH "rust-notifications/Cargo.toml")
 set(RUST_HEADERS_INCLUDE_DIR "rust-notifications/extern")
 set(RUST_LIBS "rust-notifications")
 
 file(GLOB_RECURSE SOURCE_CODE "./src/*.cpp")
 
 set(
   SOURCE_CODE
 
   ${DOUBLE_CONVERSION_SOURCES}
   ${GENERATED_CODE}
   ${SOURCE_CODE}
 )
 
 set(
   LIBS
 
   comm-services-common
   comm-tunnelbroker-grpc
 
   gRPC::grpc++_reflection
   gRPC::grpc++
   ${AWSSDK_LINK_LIBRARIES}
   PkgConfig::CRYPTOPP
   PkgConfig::LIBUV
   ${Boost_LIBRARIES}
   ${RUST_LIBS}
   amqpcpp
   OpenSSL::SSL
   glog::glog
   double-conversion::double-conversion
   Folly::folly
 )
 
 # SERVER
 add_executable(
   tunnelbroker
 
-  ${FOLLY_SOURCES}
   ${GENERATED_CODE}
   ${SOURCE_CODE}
 )
 
 target_include_directories(tunnelbroker
   PUBLIC
   ${CMAKE_CURRENT_SOURCE_DIR}/src
   ${CMAKE_CURRENT_SOURCE_DIR}/src/Database
   ${CMAKE_CURRENT_SOURCE_DIR}/src/DeliveryBroker
   ${CMAKE_CURRENT_SOURCE_DIR}/src/Service
   ${CMAKE_CURRENT_SOURCE_DIR}/src/Tools
   ${CMAKE_CURRENT_SOURCE_DIR}/src/Amqp
 )
 
 target_link_libraries(
   tunnelbroker
 
   ${LIBS}
 )
 
 install(
   TARGETS tunnelbroker
   RUNTIME DESTINATION bin/
 )
 
 # TEST
 if($ENV{COMM_TEST_SERVICES} MATCHES 1)
   file(GLOB TEST_CODE "./test/*.cpp")
   list(FILTER SOURCE_CODE EXCLUDE REGEX "./src/server.cpp")
   enable_testing()
 
   find_package(GTest REQUIRED)
-  include_directories(${GTEST_INCLUDE_DIR})
 
   add_executable(
     runTests
 
-    ${FOLLY_SOURCES}
     ${SOURCE_CODE}
     ${TEST_CODE}
   )
   target_link_libraries(
     runTests
 
     ${LIBS}
-    gtest
-    gtest_main
+    GTest::gtest_main
   )
 
-  add_test(
-    NAME runTests
-    COMMAND runTests
+  target_include_directories(runTests
+    PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Database
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/DeliveryBroker
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Service
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Tools
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Amqp
   )
+
+  include(GoogleTest)
+  gtest_discover_tests(runTests)
 endif()
diff --git a/services/tunnelbroker/test/main.cpp b/services/tunnelbroker/test/main.cpp
new file mode 100644
index 000000000..4483c91af
--- /dev/null
+++ b/services/tunnelbroker/test/main.cpp
@@ -0,0 +1,6 @@
+#include "gtest/gtest.h"
+
+int main(int argc, char **argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}