diff --git a/.vscode/settings.json b/.vscode/settings.json
index fbfe255..f8b84b1 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -10,5 +10,7 @@
   "[cpp]": {
     "editor.defaultFormatter": "trunk.io"
   },
-  "testMate.cpp.test.executables": "${workspaceFolder}/build/bin/tests"
+  "testMate.cpp.test.executables": "${workspaceFolder}/build/bin/tests",
+  "testMate.cpp.discovery.loadOnStartup": true,
+  "cmake.ctest.testExplorerIntegrationEnabled": false
 }
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72cea51..d05ab05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,8 +72,8 @@ endif()
 # Unit Tests
 #
 if(ENABLE_DOCTESTS)
-#    include(CTest)
-#    enable_testing()
+    include(CTest)
+    enable_testing()
     add_executable(tests ${sources_test})
     target_link_libraries(tests PRIVATE DeviceUI doctest::doctest lvgl::lvgl LovyanGFX Portduino Protobufs)
     target_include_directories(tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})