diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ae94b0ce9..cd95bbd0e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -16,6 +16,7 @@ cycamore Change Log
 
 * Updated build procedure to use newer versions of packages in 2023 (#549)
 * Added active/dormant and request size variation from buy policy to Storage (#546, #568)
+* Update build procedure to force a rebuild when a test file is changed (#584)
 
 v1.5.5
 ====================
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2ec825551..698e6d28d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -19,3 +19,13 @@ INSTALL(FILES run_inputs.py
     DESTINATION bin
     COMPONENT testing
     )
+
+# CMAKE_CONFIGURE_DEPENDS will force a rebuild on a change to the source file
+FILE(GLOB test_files CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/src/*_tests.*")
+FOREACH(file ${test_files})
+    SET_PROPERTY(
+        DIRECTORY
+        APPEND
+        PROPERTY CMAKE_CONFIGURE_DEPENDS ${file}
+    )
+ENDFOREACH()
\ No newline at end of file