diff --git a/src/modules/partition/tests/CMakeLists.txt b/src/modules/partition/tests/CMakeLists.txt
index 3faee608d..bb086d097 100644
--- a/src/modules/partition/tests/CMakeLists.txt
+++ b/src/modules/partition/tests/CMakeLists.txt
@@ -1,7 +1,7 @@
 find_package( Qt5 COMPONENTS Test REQUIRED )
 include( ECMAddTests )
 
-set( jobtests_SRCS
+set( partitionjobtests_SRCS
     ${PartitionModule_SOURCE_DIR}/core/PMUtils.cpp
     ${PartitionModule_SOURCE_DIR}/core/PartitionInfo.cpp
     ${PartitionModule_SOURCE_DIR}/core/PartitionIterator.cpp
@@ -12,7 +12,7 @@ set( jobtests_SRCS
     ${PartitionModule_SOURCE_DIR}/jobs/MoveFileSystemJob.cpp
     ${PartitionModule_SOURCE_DIR}/jobs/PartitionJob.cpp
     ${PartitionModule_SOURCE_DIR}/jobs/ResizePartitionJob.cpp
-    JobTests.cpp
+    PartitionJobTests.cpp
 )
 
 include_directories(
@@ -20,8 +20,8 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-ecm_add_test( ${jobtests_SRCS}
-    TEST_NAME jobtests
+ecm_add_test( ${partitionjobtests_SRCS}
+    TEST_NAME partitionjobtests
     LINK_LIBRARIES
         calapm
         ${CALAMARES_LIBRARIES}
@@ -29,4 +29,4 @@ ecm_add_test( ${jobtests_SRCS}
         Qt5::Test
 )
 
-set_target_properties( jobtests PROPERTIES AUTOMOC TRUE )
+set_target_properties( partitionjobtests PROPERTIES AUTOMOC TRUE )
diff --git a/src/modules/partition/tests/JobTests.cpp b/src/modules/partition/tests/PartitionJobTests.cpp
similarity index 94%
rename from src/modules/partition/tests/JobTests.cpp
rename to src/modules/partition/tests/PartitionJobTests.cpp
index 0f77ee360..d337eec36 100644
--- a/src/modules/partition/tests/JobTests.cpp
+++ b/src/modules/partition/tests/PartitionJobTests.cpp
@@ -1,4 +1,4 @@
-#include <JobTests.h>
+#include <PartitionJobTests.h>
 
 #include <jobs/CreatePartitionJob.h>
 #include <jobs/CreatePartitionTableJob.h>
@@ -16,7 +16,7 @@
 #include <QProcess>
 #include <QtTest/QtTest>
 
-QTEST_GUILESS_MAIN( JobTests )
+QTEST_GUILESS_MAIN( PartitionJobTests )
 
 static const qint64 MB = 1024 * 1024;
 
@@ -134,13 +134,13 @@ QueueRunner::onFailed( const QString& message, const QString& details )
     QFAIL( qPrintable( msg ) );
 }
 
-//- JobTests ------------------------------------------------------------------
-JobTests::JobTests()
+//- PartitionJobTests ------------------------------------------------------------------
+PartitionJobTests::PartitionJobTests()
     : m_runner( &m_queue )
 {}
 
 void
-JobTests::initTestCase()
+PartitionJobTests::initTestCase()
 {
     QString devicePath = qgetenv( "CALAMARES_TEST_DISK" );
     if ( devicePath.isEmpty() )
@@ -155,7 +155,7 @@ JobTests::initTestCase()
 }
 
 void
-JobTests::refreshDevice()
+PartitionJobTests::refreshDevice()
 {
     QString devicePath = qgetenv( "CALAMARES_TEST_DISK" );
     CoreBackend* backend = CoreBackendManager::self()->backend();
@@ -164,7 +164,7 @@ JobTests::refreshDevice()
 }
 
 void
-JobTests::testPartitionTable()
+PartitionJobTests::testPartitionTable()
 {
     queuePartitionTableCreation( PartitionTable::msdos );
     QVERIFY( m_runner.run() );
@@ -178,7 +178,7 @@ JobTests::testPartitionTable()
 }
 
 void
-JobTests::queuePartitionTableCreation( PartitionTable::TableType type)
+PartitionJobTests::queuePartitionTableCreation( PartitionTable::TableType type)
 {
     auto job = new CreatePartitionTableJob( m_device.data(), type );
     job->updatePreview();
@@ -186,7 +186,7 @@ JobTests::queuePartitionTableCreation( PartitionTable::TableType type)
 }
 
 CreatePartitionJob*
-JobTests::newCreatePartitionJob( Partition* freeSpacePartition, PartitionRole role, FileSystem::Type type, qint64 size )
+PartitionJobTests::newCreatePartitionJob( Partition* freeSpacePartition, PartitionRole role, FileSystem::Type type, qint64 size )
 {
     Q_ASSERT( freeSpacePartition );
 
@@ -215,7 +215,7 @@ JobTests::newCreatePartitionJob( Partition* freeSpacePartition, PartitionRole ro
 }
 
 void
-JobTests::testCreatePartition()
+PartitionJobTests::testCreatePartition()
 {
     queuePartitionTableCreation( PartitionTable::gpt );
     CreatePartitionJob* job;
@@ -256,7 +256,7 @@ JobTests::testCreatePartition()
 }
 
 void
-JobTests::testCreatePartitionExtended()
+PartitionJobTests::testCreatePartitionExtended()
 {
     queuePartitionTableCreation( PartitionTable::msdos );
     CreatePartitionJob* job;
@@ -296,7 +296,7 @@ JobTests::testCreatePartitionExtended()
 }
 
 void
-JobTests::testResizePartition_data()
+PartitionJobTests::testResizePartition_data()
 {
     QTest::addColumn< int >( "oldStartMB" );
     QTest::addColumn< int >( "oldSizeMB" );
@@ -310,7 +310,7 @@ JobTests::testResizePartition_data()
 }
 
 void
-JobTests::testResizePartition()
+PartitionJobTests::testResizePartition()
 {
     QFETCH( int, oldStartMB );
     QFETCH( int, oldSizeMB );
diff --git a/src/modules/partition/tests/JobTests.h b/src/modules/partition/tests/PartitionJobTests.h
similarity index 88%
rename from src/modules/partition/tests/JobTests.h
rename to src/modules/partition/tests/PartitionJobTests.h
index 281450cc5..c14bdfd46 100644
--- a/src/modules/partition/tests/JobTests.h
+++ b/src/modules/partition/tests/PartitionJobTests.h
@@ -1,5 +1,5 @@
-#ifndef JOBTESTS_H
-#define JOBTESTS_H
+#ifndef PARTITIONJOBTESTS_H
+#define PARTITIONJOBTESTS_H
 
 #include <JobQueue.h>
 
@@ -32,11 +32,11 @@ private:
     bool m_success;
 };
 
-class JobTests : public QObject
+class PartitionJobTests : public QObject
 {
     Q_OBJECT
 public:
-    JobTests();
+    PartitionJobTests();
 
 private Q_SLOTS:
     void initTestCase();
@@ -56,4 +56,4 @@ private:
     void refreshDevice();
 };
 
-#endif /* JOBTESTS_H */
+#endif /* PARTITIONJOBTESTS_H */