diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 32078d388..884750735 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -3,7 +3,8 @@ file(GLOB test_SRC
   "*.cpp" "*.c")
 
 add_executable(testPOET ${test_SRC})
-target_link_libraries(testPOET doctest poet_lib)
+target_link_libraries(testPOET doctest poetlib)
+target_include_directories(testPOET PRIVATE "${PROJECT_SOURCE_DIR}/src")
 
 get_filename_component(TEST_RInsideSourceFile "RInsidePOET_funcs.R" REALPATH)
 configure_file(testDataStructures.hpp.in testDataStructures.hpp)
diff --git a/test/testField.cpp b/test/testField.cpp
index 8ee1bf5d6..acfe8d1a8 100644
--- a/test/testField.cpp
+++ b/test/testField.cpp
@@ -5,11 +5,12 @@
 #include <cstdint>
 #include <doctest/doctest.h>
 #include <iostream>
-#include <poet/DataStructures.hpp>
-#include <poet/RInsidePOET.hpp>
 #include <string>
 #include <vector>
 
+#include <Base/RInsidePOET.hpp>
+#include <DataStructures/DataStructures.hpp>
+
 #include "testDataStructures.hpp"
 
 using namespace poet;
diff --git a/test/testNamedVector.cpp b/test/testNamedVector.cpp
index 713f2729b..d5ee908f5 100644
--- a/test/testNamedVector.cpp
+++ b/test/testNamedVector.cpp
@@ -1,11 +1,12 @@
 #include <Rcpp.h>
 #include <cstddef>
 #include <doctest/doctest.h>
-#include <poet/DataStructures.hpp>
-#include <poet/RInsidePOET.hpp>
 #include <utility>
 #include <vector>
 
+#include <Base/RInsidePOET.hpp>
+#include <DataStructures/DataStructures.hpp>
+
 #include "testDataStructures.hpp"
 
 TEST_CASE("NamedVector") {
diff --git a/test/testRounding.cpp b/test/testRounding.cpp
index 06deef193..be50fac99 100644
--- a/test/testRounding.cpp
+++ b/test/testRounding.cpp
@@ -1,6 +1,6 @@
 #include <doctest/doctest.h>
 
-#include "poet/Rounding.hpp"
+#include <Chemistry/SurrogateModels/Rounding.hpp>
 
 TEST_CASE("Rounding") {
   constexpr int signif = 3;