diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt
index e2d2e3117..a486e93c3 100644
--- a/src/modules/users/CMakeLists.txt
+++ b/src/modules/users/CMakeLists.txt
@@ -44,7 +44,7 @@ calamares_add_plugin( users
 calamares_add_test(
     userspasswordtest
     SOURCES
-        PasswordTests.cpp
+        TestPasswordJob.cpp
         SetPasswordJob.cpp
     LIBRARIES
         ${CRYPT_LIBRARIES}
@@ -53,15 +53,15 @@ calamares_add_test(
 calamares_add_test(
     userscreatetest
     SOURCES
-        CreateUserTests.cpp
+        TestCreateUserJob.cpp
         CreateUserJob.cpp
         Config.cpp
 )
 
 calamares_add_test(
-    userstest
+    usershostnametest
     SOURCES
-        Tests.cpp
+        TestSetHostNameJob.cpp
         SetHostNameJob.cpp
     LIBRARIES
         Qt5::DBus
diff --git a/src/modules/users/CreateUserTests.cpp b/src/modules/users/TestCreateUserJob.cpp
similarity index 99%
rename from src/modules/users/CreateUserTests.cpp
rename to src/modules/users/TestCreateUserJob.cpp
index 50592a384..f8c28a235 100644
--- a/src/modules/users/CreateUserTests.cpp
+++ b/src/modules/users/TestCreateUserJob.cpp
@@ -134,4 +134,4 @@ QTEST_GUILESS_MAIN( CreateUserTests )
 
 #include "utils/moc-warnings.h"
 
-#include "CreateUserTests.moc"
+#include "TestCreateUserJob.moc"
diff --git a/src/modules/users/PasswordTests.cpp b/src/modules/users/TestPasswordJob.cpp
similarity index 98%
rename from src/modules/users/PasswordTests.cpp
rename to src/modules/users/TestPasswordJob.cpp
index 0c1b4bffc..7f38c109d 100644
--- a/src/modules/users/PasswordTests.cpp
+++ b/src/modules/users/TestPasswordJob.cpp
@@ -18,7 +18,7 @@
 
 #include "SetPasswordJob.h"
 
-#include "PasswordTests.h"
+#include "TestPasswordJob.h"
 
 #include <QtTest/QtTest>
 
diff --git a/src/modules/users/PasswordTests.h b/src/modules/users/TestPasswordJob.h
similarity index 100%
rename from src/modules/users/PasswordTests.h
rename to src/modules/users/TestPasswordJob.h
diff --git a/src/modules/users/Tests.cpp b/src/modules/users/TestSetHostNameJob.cpp
similarity index 99%
rename from src/modules/users/Tests.cpp
rename to src/modules/users/TestSetHostNameJob.cpp
index 196fd9d68..9e08d4807 100644
--- a/src/modules/users/Tests.cpp
+++ b/src/modules/users/TestSetHostNameJob.cpp
@@ -142,4 +142,4 @@ QTEST_GUILESS_MAIN( UsersTests )
 
 #include "utils/moc-warnings.h"
 
-#include "Tests.moc"
+#include "TestSetHostNameJob.moc"