diff --git a/.gitattributes b/.gitattributes
index 6113cd968cdc7dae9ad4051653d7ea702c6b242f..631b40ee592ea1f0a42310ebaf200f3ee9955608 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4340,10 +4340,10 @@ SAS/DataManagement/Cleanup/CleanupService/__init__.py -text
 SAS/DataManagement/Cleanup/CleanupService/cleanupservice -text
 SAS/DataManagement/Cleanup/CleanupService/cleanupservice.ini -text
 SAS/DataManagement/Cleanup/CleanupService/service.py -text
-SAS/DataManagement/Cleanup/test/CMakeLists.txt -text
-SAS/DataManagement/Cleanup/test/test_cleanup_service_and_rpc.py -text
-SAS/DataManagement/Cleanup/test/test_cleanup_service_and_rpc.run -text
-SAS/DataManagement/Cleanup/test/test_cleanup_service_and_rpc.sh -text
+SAS/DataManagement/Cleanup/CleanupService/test/CMakeLists.txt -text
+SAS/DataManagement/Cleanup/CleanupService/test/test_cleanup_service_and_rpc.py -text
+SAS/DataManagement/Cleanup/CleanupService/test/test_cleanup_service_and_rpc.run -text
+SAS/DataManagement/Cleanup/CleanupService/test/test_cleanup_service_and_rpc.sh -text
 SAS/DataManagement/DataManagementCommon/CMakeLists.txt -text
 SAS/DataManagement/DataManagementCommon/__init__.py -text
 SAS/DataManagement/DataManagementCommon/config.py -text
diff --git a/SAS/DataManagement/Cleanup/CMakeLists.txt b/SAS/DataManagement/Cleanup/CMakeLists.txt
index 40b9f1e6b8209a86aa0d80f1aa4356c2edccf64f..03604390ab271a15f634e892d31675e4cfaac5d4 100644
--- a/SAS/DataManagement/Cleanup/CMakeLists.txt
+++ b/SAS/DataManagement/Cleanup/CMakeLists.txt
@@ -7,4 +7,3 @@ lofar_add_package(AutoCleanupService)
 
 lofar_package(Cleanup DEPENDS CleanupService CleanupClient AutoCleanupService CleanupCommon)
 
-add_subdirectory(test)
diff --git a/SAS/DataManagement/Cleanup/CleanupService/CMakeLists.txt b/SAS/DataManagement/Cleanup/CleanupService/CMakeLists.txt
index 8d2f2251a0dd12f259557c15952c217022cab316..bd20fe260675279a75ef5d495b316a7b2d461697 100644
--- a/SAS/DataManagement/Cleanup/CleanupService/CMakeLists.txt
+++ b/SAS/DataManagement/Cleanup/CleanupService/CMakeLists.txt
@@ -19,3 +19,4 @@ install(FILES
   cleanupservice.ini
   DESTINATION etc/supervisord.d)
 
+add_subdirectory(test)
diff --git a/SAS/DataManagement/Cleanup/test/CMakeLists.txt b/SAS/DataManagement/Cleanup/CleanupService/test/CMakeLists.txt
similarity index 100%
rename from SAS/DataManagement/Cleanup/test/CMakeLists.txt
rename to SAS/DataManagement/Cleanup/CleanupService/test/CMakeLists.txt
diff --git a/SAS/DataManagement/Cleanup/test/test_cleanup_service_and_rpc.py b/SAS/DataManagement/Cleanup/CleanupService/test/test_cleanup_service_and_rpc.py
similarity index 100%
rename from SAS/DataManagement/Cleanup/test/test_cleanup_service_and_rpc.py
rename to SAS/DataManagement/Cleanup/CleanupService/test/test_cleanup_service_and_rpc.py
diff --git a/SAS/DataManagement/Cleanup/test/test_cleanup_service_and_rpc.run b/SAS/DataManagement/Cleanup/CleanupService/test/test_cleanup_service_and_rpc.run
similarity index 100%
rename from SAS/DataManagement/Cleanup/test/test_cleanup_service_and_rpc.run
rename to SAS/DataManagement/Cleanup/CleanupService/test/test_cleanup_service_and_rpc.run
diff --git a/SAS/DataManagement/Cleanup/test/test_cleanup_service_and_rpc.sh b/SAS/DataManagement/Cleanup/CleanupService/test/test_cleanup_service_and_rpc.sh
similarity index 100%
rename from SAS/DataManagement/Cleanup/test/test_cleanup_service_and_rpc.sh
rename to SAS/DataManagement/Cleanup/CleanupService/test/test_cleanup_service_and_rpc.sh