diff --git a/CMakeLists.txt b/CMakeLists.txt
index 162a9327..5860f010 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,11 +7,11 @@ endif()
 project(libcdoc VERSION 0.1.5)
 
 macro(SET_ENV NAME DEF)
-	if(DEFINED ENV{${NAME}})
-		set(${NAME} $ENV{${NAME}} ${ARGN})
-	else()
-		set(${NAME} ${DEF} ${ARGN})
-	endif()
+    if(DEFINED ENV{${NAME}})
+        set(${NAME} $ENV{${NAME}} ${ARGN})
+    else()
+        set(${NAME} ${DEF} ${ARGN})
+    endif()
 endmacro()
 
 SET_ENV(BUILD_NUMBER 0)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 57568b8b..ea4c1722 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,10 +2,12 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
 
 add_executable(unittests libcdoc_boost.cpp)
+target_compile_definitions(unittests PRIVATE DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data")
 target_link_libraries(unittests cdoc cdoc_priv Boost::unit_test_framework)
 
 add_test(NAME runtest
-    COMMAND ${CMAKE_CURRENT_BINARY_DIR}/unittests --build_info=YES --logger=HRF,all,stdout -- ${CMAKE_CURRENT_SOURCE_DIR}/data
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+    COMMAND ${CMAKE_CURRENT_BINARY_DIR}/unittests --build_info=YES --logger=HRF,all,stdout
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+)
 
 add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} DEPENDS unittests)
diff --git a/test/libcdoc_boost.cpp b/test/libcdoc_boost.cpp
index 1bf7c06d..42367031 100644
--- a/test/libcdoc_boost.cpp
+++ b/test/libcdoc_boost.cpp
@@ -8,6 +8,10 @@
 #include <Recipient.h>
 #include <Utils.h>
 
+#ifndef DATA_DIR
+#define DATA_DIR "."
+#endif
+
 namespace btools = boost::test_tools;
 namespace utf = boost::unit_test;
 namespace fs = std::filesystem;
@@ -50,7 +54,7 @@ class FixtureBase
         // Get path to test data, provided via argument to the unit tests application
         if (utf::framework::master_test_suite().argc <= 1)
         {
-            testDataPath = ".";
+            testDataPath = DATA_DIR;
         }
         else
         {