diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d3084a34..8ac83962 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -411,3 +411,5 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
 endif()
 # Disable this as it relies on a non-standard feature
 target_compile_definitions(dynarmic PRIVATE FMT_USE_USER_DEFINED_LITERALS=0)
+
+#export(TARGETS dynarmic boost fmt xbyak FILE "dynarmic-config.cmake")
diff --git a/tests/A32/fuzz_arm.cpp b/tests/A32/fuzz_arm.cpp
index b769623e..c6edfccc 100644
--- a/tests/A32/fuzz_arm.cpp
+++ b/tests/A32/fuzz_arm.cpp
@@ -33,6 +33,14 @@
 #include <fmt/format.h>
 #include <fmt/ostream.h>
 
+static Dynarmic::A32::UserConfig GetUserConfig(ArmTestEnv* testenv) {
+    Dynarmic::A32::UserConfig user_config;
+    user_config.enable_fast_dispatch = false;
+    user_config.callbacks = testenv;
+    user_config.fastmem_pointer = reinterpret_cast<void*>(0xFFFFFDDE00000000);
+    return user_config;
+}
+
 namespace {
 using namespace Dynarmic;
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ef550cbe..315f2990 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -67,6 +67,7 @@ endif()
 target_include_directories(dynarmic_tests PRIVATE . ../src)
 target_compile_options(dynarmic_tests PRIVATE ${DYNARMIC_CXX_FLAGS})
 target_compile_definitions(dynarmic_tests PRIVATE FMT_USE_USER_DEFINED_LITERALS=0)
+target_compile_options(dynarmic_tests PRIVATE -DCATCH_CONFIG_NO_WINDOWS_SEH -DCATCH_CONFIG_NO_POSIX_SIGNALS)
 
 target_link_libraries(dynarmic_print_info PRIVATE dynarmic boost catch fmt mp)
 target_include_directories(dynarmic_print_info PRIVATE . ../src)