diff --git a/firmware/asdf/src/Arch/asdf_arch_test.h b/firmware/asdf/src/Arch/asdf_arch_test.h
index ae23f13..6839dbe 100644
--- a/firmware/asdf/src/Arch/asdf_arch_test.h
+++ b/firmware/asdf/src/Arch/asdf_arch_test.h
@@ -31,7 +31,6 @@
 #include "asdf_config.h"
 #include "asdf_physical.h"
 #include "asdf_virtual.h"
-#include "asdf_arch.h"
 
 
 
diff --git a/firmware/asdf/test/CmakeLists.txt b/firmware/asdf/test/CmakeLists.txt
index 329eb34..efaa3e9 100644
--- a/firmware/asdf/test/CmakeLists.txt
+++ b/firmware/asdf/test/CmakeLists.txt
@@ -1,4 +1,5 @@
 temporary_config_file(${ASDF_SRC_DIR}/Keymaps/asdf_all_keymap_defs_test.h ${CMAKE_CURRENT_BINARY_DIR}/asdf_keymap_defs.h)
+temporary_config_file(${ASDF_SRC_DIR}/Arch/asdf_arch_test.h ${CMAKE_CURRENT_BINARY_DIR}/asdf_arch.h)
 
 list(APPEND C_FLAGS
   "-std=c99"
@@ -48,13 +49,14 @@ target_include_directories(asdf_core
 add_library(test_helpers
   STATIC
   ${CMAKE_CURRENT_SOURCE_DIR}/test_asdf_lib.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_asdf_keymap_defs.c
   )
 
 target_include_directories(test_helpers
   PRIVATE
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${ASDF_SRC_DIR}
-  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
   )
 
 
diff --git a/firmware/asdf/test/test_asdf_hook.c b/firmware/asdf/test/test_asdf_hook.c
index 02f79e5..818a6ae 100644
--- a/firmware/asdf/test/test_asdf_hook.c
+++ b/firmware/asdf/test/test_asdf_hook.c
@@ -4,7 +4,7 @@
 
 #include "unity.h"
 #include "asdf.h"
-#include "asdf_arch.h"
+#include "asdf_arch_test.h"
 #include "asdf_ascii.h"
 #include "asdf_modifiers.h"
 #include "asdf_keymaps.h"
diff --git a/firmware/asdf/test/test_asdf_keymaps.c b/firmware/asdf/test/test_asdf_keymaps.c
index e2a95e6..19ae583 100644
--- a/firmware/asdf/test/test_asdf_keymaps.c
+++ b/firmware/asdf/test/test_asdf_keymaps.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
 #include <stdarg.h>
-#include "asdf_arch.h"
+#include "asdf_arch_test.h"
 #include "unity.h"
 #include "asdf.h"
 #include "asdf_ascii.h"
diff --git a/firmware/asdf/test/test_asdf_virtual.c b/firmware/asdf/test/test_asdf_virtual.c
index e902b36..5b88acf 100644
--- a/firmware/asdf/test/test_asdf_virtual.c
+++ b/firmware/asdf/test/test_asdf_virtual.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
 #include <stdarg.h>
-#include "asdf_arch.h"
+#include "asdf_arch_test.h"
 #include "unity.h"
 #include "asdf.h"
 #include "asdf_ascii.h"