diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ea26ae9..0f489f28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@
 - Dev: Compile time definitions for `Windows.h` are now conditional based on `WIN32` instead of `MSVC`. (#6534)
 - Dev: Refactored split container nodes to use shared pointers. (#6435)
 - Dev: Mock headers are now added as a header set if supported by CMake. (#6561)
+- Dev: Set settings directory to temporary one used in tests. (#6584)
 
 ## 2.5.4
 
diff --git a/mocks/include/mocks/EmptyApplication.hpp b/mocks/include/mocks/EmptyApplication.hpp
index 0f09cf2a..808b3429 100644
--- a/mocks/include/mocks/EmptyApplication.hpp
+++ b/mocks/include/mocks/EmptyApplication.hpp
@@ -23,6 +23,7 @@ public:
             settingsFile.flush();
             settingsFile.close();
         }
+        this->paths_.settingsDirectory = this->settingsDir.path();
     }
 
     ~EmptyApplication() override = default;