diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index b79d00b6c4..0332eb7e29 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -25,8 +25,8 @@ add_executable(nxt_unittests
     ${UNITTESTS_DIR}/RefCountedTests.cpp
     ${UNITTESTS_DIR}/ToBackendTests.cpp
     ${UNITTESTS_DIR}/WireTests.cpp
-    ${VALIDATION_TESTS_DIR}/BufferValidationTest.cpp
-    ${VALIDATION_TESTS_DIR}/DepthStencilStateValidationTest.cpp
+    ${VALIDATION_TESTS_DIR}/BufferValidationTests.cpp
+    ${VALIDATION_TESTS_DIR}/DepthStencilStateValidationTests.cpp
     ${VALIDATION_TESTS_DIR}/ValidationTest.cpp
     ${VALIDATION_TESTS_DIR}/ValidationTest.h
     ${TESTS_DIR}/UnittestsMain.cpp
diff --git a/src/tests/unittests/validation/BufferValidationTest.cpp b/src/tests/unittests/validation/BufferValidationTests.cpp
similarity index 100%
rename from src/tests/unittests/validation/BufferValidationTest.cpp
rename to src/tests/unittests/validation/BufferValidationTests.cpp
diff --git a/src/tests/unittests/validation/DepthStencilStateValidationTest.cpp b/src/tests/unittests/validation/DepthStencilStateValidationTests.cpp
similarity index 100%
rename from src/tests/unittests/validation/DepthStencilStateValidationTest.cpp
rename to src/tests/unittests/validation/DepthStencilStateValidationTests.cpp