diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bfd727247c..e31a27f61c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -54,6 +54,8 @@ add_library(oqs kem/kem.c
                 ${SIG_OBJS}
                 ${COMMON_OBJS})
 set(COMMON_OBJS ${COMMON_OBJS} PARENT_SCOPE)
+set(_ALL_OBJS ${KEM_OBJS} ${SIG_OBJS} ${COMMON_OBJS} $<TARGET_OBJECTS:oqs>)
+set(ALL_OBJS ${_ALL_OBJS} PARENT_SCOPE)
 if(DEFINED SANITIZER_LD_FLAGS)
     target_link_libraries(oqs PUBLIC ${SANITIZER_LD_FLAGS})
 endif()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 63dc38f517..d7542cfae8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -65,7 +65,7 @@ add_executable(example_kem example_kem.c)
 target_link_libraries(example_kem PRIVATE ${API_TEST_DEPS})
 
 # KAT KEM needs to call the internal SHA3 functions directly, hence the extra dependencies
-add_executable(kat_kem kat_kem.c ${COMMON_OBJS})
+add_executable(kat_kem kat_kem.c ${ALL_OBJS})
 target_link_libraries(kat_kem PRIVATE ${API_TEST_DEPS} ${INTERNAL_TEST_DEPS})
 
 add_executable(test_kem test_kem.c)