diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 8e95089035e1462c87fd003da3451555e1928e63..a04d375dd98512227dbb3f92cbb07e7274a9e1e0 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -6,7 +6,9 @@ macro(add_unittest _name)
   # for now we use the same name also for the target
   set(_target ${_name})
   add_executable(${_target} ${ARGN})
-  target_include_directories(${_target} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+  target_include_directories(
+    ${_target}
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
   target_link_libraries(
     ${_target}
     PRIVATE ActsCore ActsTestsCommonHelpers Boost::unit_test_framework)
@@ -22,7 +24,9 @@ macro(add_integrationtest _name)
   # for now we use the same name also for the target
   set(_target ${_name})
   add_executable(${_target} ${ARGN})
-  target_include_directories(${_target} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+  target_include_directories(
+    ${_target}
+    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
   target_link_libraries(
     ${_target}
     PRIVATE ActsCore ActsTestsCommonHelpers Boost::unit_test_framework)
diff --git a/Tests/Examples/CMakeLists.txt b/Tests/Examples/CMakeLists.txt
index b0ea2cde54abb860085e7005beca43e87e2461cd..038b2b9ce9a52aee6753e24c8f77a3ceb61617a7 100644
--- a/Tests/Examples/CMakeLists.txt
+++ b/Tests/Examples/CMakeLists.txt
@@ -1,13 +1,13 @@
 add_library(
   ActsCustomLogger SHARED
-  src/CustomDefaultLogger.cpp)
+  CustomDefaultLogger.cpp)
 target_include_directories(
   ActsCustomLogger
   PRIVATE ${PROJECT_SOURCE_DIR}/Core/include)
 
 add_executable(
   ActsTabulateEnergyLoss
-  src/TabulateEnergyLoss.cpp)
+  TabulateEnergyLoss.cpp)
 target_link_libraries(
   ActsTabulateEnergyLoss
   PRIVATE ActsCore ActsTestsCommonHelpers)
diff --git a/Tests/Examples/src/CustomDefaultLogger.cpp b/Tests/Examples/CustomDefaultLogger.cpp
similarity index 100%
rename from Tests/Examples/src/CustomDefaultLogger.cpp
rename to Tests/Examples/CustomDefaultLogger.cpp
diff --git a/Tests/Examples/src/TabulateEnergyLoss.cpp b/Tests/Examples/TabulateEnergyLoss.cpp
similarity index 100%
rename from Tests/Examples/src/TabulateEnergyLoss.cpp
rename to Tests/Examples/TabulateEnergyLoss.cpp