diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index ffcae42f6..50706a057 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -60,6 +60,7 @@ if (ENABLE_TESTS)
         add_subdirectory(catch2)
     endif()
     target_link_libraries(catch2 INTERFACE Catch2::Catch2WithMain)
+    include(Catch)
 endif()
 
 # Crypto++
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index d35e6ba21..027609c26 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -36,6 +36,10 @@ if (ENABLE_LIBRETRO)
 endif()
 
 add_test(NAME tests COMMAND tests)
+if(NOT ANDROID)
+    catch_discover_tests(tests)
+endif()
+
 
 if (CITRA_USE_PRECOMPILED_HEADERS)
     target_precompile_headers(tests PRIVATE precompiled_headers.h)