diff --git a/CMakeLists.txt b/CMakeLists.txt
index 142d28c3..3239de2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,4 +3,4 @@ cmake_minimum_required(VERSION 3.10)
 project(BatteryEmulator)
 
 add_subdirectory(Software/src/devboard/utils)
-add_subdirectory(Software/test)
+add_subdirectory(test)
diff --git a/Software/src/devboard/utils/events_test.cpp b/Software/src/devboard/utils/events_test.cpp
index 6678db2d..1c38a888 100644
--- a/Software/src/devboard/utils/events_test.cpp
+++ b/Software/src/devboard/utils/events_test.cpp
@@ -1,5 +1,5 @@
 // The test library must be included first!
-#include "../../../test/test_lib.h"
+#include "../../../../test/test_lib.h"
 
 #include "events.cpp"
 
diff --git a/Software/test/CMakeLists.txt b/test/CMakeLists.txt
similarity index 61%
rename from Software/test/CMakeLists.txt
rename to test/CMakeLists.txt
index 30d2430d..d12a405e 100644
--- a/Software/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_executable(events_test ../src/devboard/utils/events_test.cpp test_lib.cpp)
+add_executable(events_test ../Software/src/devboard/utils/events_test.cpp test_lib.cpp)
 
 target_compile_definitions(events_test PRIVATE UNIT_TEST)
 
diff --git a/Software/test/microtest.h b/test/microtest.h
similarity index 100%
rename from Software/test/microtest.h
rename to test/microtest.h
diff --git a/Software/test/test_lib.cpp b/test/test_lib.cpp
similarity index 100%
rename from Software/test/test_lib.cpp
rename to test/test_lib.cpp
diff --git a/Software/test/test_lib.h b/test/test_lib.h
similarity index 100%
rename from Software/test/test_lib.h
rename to test/test_lib.h