diff --git a/tests/unit/database-test-data.hpp b/tests/unit/database-test-data.hpp
index 5091dd7..0db768c 100644
--- a/tests/unit/database-test-data.hpp
+++ b/tests/unit/database-test-data.hpp
@@ -23,7 +23,7 @@
 #include "daemon/db-mgr.hpp"
 #include "clients/response.hpp"
 #include "clients/query.hpp"
-#include "validator.hpp"
+#include "validator/validator.hpp"
 
 #include "test-common.hpp"
 
diff --git a/tests/unit/validator.cpp b/tests/unit/validator/validator.cpp
similarity index 99%
rename from tests/unit/validator.cpp
rename to tests/unit/validator/validator.cpp
index c642875..54d1dd8 100644
--- a/tests/unit/validator.cpp
+++ b/tests/unit/validator/validator.cpp
@@ -17,7 +17,7 @@
  * NDNS, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "validator.hpp"
+#include "validator/validator.hpp"
 
 #include "test-common.hpp"
 #include "util/cert-helper.hpp"