diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 5c246eaf48..253546a783 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -29,7 +29,7 @@ if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
 endif()
 
 # Oaknut (also used by Dynarmic, so needs to be added first)
-if (ARCHITECTURE_arm64)
+if (ARCHITECTURE_arm64 OR DYNARMIC_TESTS)
     CPMAddPackage(
         NAME oaknut
         VERSION 2.0.1
diff --git a/src/dynarmic/externals/CMakeLists.txt b/src/dynarmic/externals/CMakeLists.txt
index b5b77b83af..a27ede7033 100644
--- a/src/dynarmic/externals/CMakeLists.txt
+++ b/src/dynarmic/externals/CMakeLists.txt
@@ -35,7 +35,7 @@ endif()
 # TODO(crueter): dedup
 if (NOT TARGET Catch2::Catch2WithMain)
     if (DYNARMIC_TESTS)
-        add_subdirectory(catch EXCLUDE_FROM_ALL)
+        find_package(Catch2 3.0.1 REQUIRED)
     endif()
 endif()