diff --git a/ext/ghoul b/ext/ghoul
index 274d2beed3..d607a6d6b1 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 274d2beed38bb24ef693b2a8c9c95307bdf5204f
+Subproject commit d607a6d6b11be4ad05ccd555b8b290a782e0e384
diff --git a/support/coding/codegen b/support/coding/codegen
index 60b97c04cc..3bc8dc5546 160000
--- a/support/coding/codegen
+++ b/support/coding/codegen
@@ -1 +1 @@
-Subproject commit 60b97c04cce28a51aedc46dc74db63f7bc1cc930
+Subproject commit 3bc8dc554648d59dc7bec9a5d9c5882415ececcb
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 98bc129461..434608d6e0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -63,6 +63,10 @@ target_include_directories(OpenSpaceTest
 target_compile_definitions(OpenSpaceTest PUBLIC "GHL_THROW_ON_ASSERT")
 target_link_libraries(OpenSpaceTest PUBLIC Catch2 openspace-core sgct)
 
+target_precompile_headers(OpenSpaceTest PRIVATE
+  <catch2/catch_test_macros.hpp>
+)
+
 foreach (library_name ${all_enabled_modules})
   get_target_property(library_type ${library_name} TYPE)
   if (NOT ${library_type} STREQUAL "SHARED_LIBRARY")