7 files changed, 8 insertions, 10 deletions
diff --git a/libs/acpi/CMakeLists.txt b/libs/acpi/CMakeLists.txt
index e73c6b3..d6d607a 100644
--- a/libs/acpi/CMakeLists.txt
+++ b/libs/acpi/CMakeLists.txt
@@ -95,7 +95,7 @@ if(BUILD_TESTING)
     list(APPEND GENERATED_TABLE_BLOBS "${CMAKE_CURRENT_BINARY_DIR}/test_data/${TABLE}.aml")
   endforeach()
 
-  set_source_files_properties("test_data/tables.S" PROPERTIES OBJECT_DEPENDS "${GENERATED_TABLE_BLOBS}")
+  set_source_files_properties("acpi/test_data/tables.S" PROPERTIES OBJECT_DEPENDS "${GENERATED_TABLE_BLOBS}")
 
   if(COMMAND "enable_coverage")
     enable_coverage("acpi")
@@ -111,7 +111,7 @@ if(BUILD_TESTING)
     "acpi/data/xsdt.test.cpp"
     "acpi/pointers.test.cpp"
 
-    "test_data/tables.S"
+    "acpi/test_data/tables.S"
   )
 
   target_include_directories("acpi_tests" PRIVATE
diff --git a/libs/acpi/acpi/common/table_header.test.cpp b/libs/acpi/acpi/common/table_header.test.cpp
index 53cdb26..ddc879e 100644
--- a/libs/acpi/acpi/common/table_header.test.cpp
+++ b/libs/acpi/acpi/common/table_header.test.cpp
@@ -1,11 +1,11 @@
 #include <acpi/common/table_header.hpp>
 
+#include <acpi/test_data/tables.hpp>
+
 #include <kstd/units>
 
 #include <catch2/catch_test_macros.hpp>
 
-#include <test_data/tables.hpp>
-
 SCENARIO("Common table header parsing", "[common_table_header]")
 {
   GIVEN("A valid compiled table header")
diff --git a/libs/acpi/acpi/data/madt.test.cpp b/libs/acpi/acpi/data/madt.test.cpp
index 5d3b366..1b95a74 100644
--- a/libs/acpi/acpi/data/madt.test.cpp
+++ b/libs/acpi/acpi/data/madt.test.cpp
@@ -1,13 +1,13 @@
 #include <acpi/data/madt.hpp>
 
+#include <acpi/test_data/tables.hpp>
+
 #include <kstd/units>
 
 #include <catch2/catch_test_macros.hpp>
 
 #include <iterator>
 
-#include <test_data/tables.hpp>
-
 SCENARIO("MADT parsing", "[madt]")
 {
   GIVEN("The basic compiled MADT containing a single LAPIC entry and the default x86 LAPIC address")
diff --git a/libs/acpi/acpi/data/rsdt.test.cpp b/libs/acpi/acpi/data/rsdt.test.cpp
index a6dd416..47992ce 100644
--- a/libs/acpi/acpi/data/rsdt.test.cpp
+++ b/libs/acpi/acpi/data/rsdt.test.cpp
@@ -1,6 +1,7 @@
 #include <acpi/data/rsdt.hpp>
 
 #include <acpi/acpi.hpp>
+#include <acpi/test_data/tables.hpp>
 
 #include <kstd/units>
 
@@ -8,8 +9,6 @@
 
 #include <iterator>
 
-#include <test_data/tables.hpp>
-
 SCENARIO("RSDT parsing", "[rsdt]")
 {
   GIVEN("The basic compiled RSDT containing 8 table pointers")
diff --git a/libs/acpi/acpi/data/xsdt.test.cpp b/libs/acpi/acpi/data/xsdt.test.cpp
index cc18a66..77a5340 100644
--- a/libs/acpi/acpi/data/xsdt.test.cpp
+++ b/libs/acpi/acpi/data/xsdt.test.cpp
@@ -1,6 +1,7 @@
 #include <acpi/data/xsdt.hpp>
 
 #include <acpi/acpi.hpp>
+#include <acpi/test_data/tables.hpp>
 
 #include <kstd/units>
 
@@ -8,8 +9,6 @@
 
 #include <iterator>
 
-#include <test_data/tables.hpp>
-
 SCENARIO("XSDT parsing", "[xsdt]")
 {
   GIVEN("The basic compiled XSDT containing 8 table pointers")
diff --git a/libs/acpi/test_data/tables.S b/libs/acpi/acpi/test_data/tables.S
index 641db6a..641db6a 100644
--- a/libs/acpi/test_data/tables.S
+++ b/libs/acpi/acpi/test_data/tables.S
diff --git a/libs/acpi/test_data/tables.hpp b/libs/acpi/acpi/test_data/tables.hpp
index e91f1a5..e91f1a5 100644
--- a/libs/acpi/test_data/tables.hpp
+++ b/libs/acpi/acpi/test_data/tables.hpp