diff --git a/src/calamares/CMakeLists.txt b/src/calamares/CMakeLists.txt
index e1f8e4236..c913c0959 100644
--- a/src/calamares/CMakeLists.txt
+++ b/src/calamares/CMakeLists.txt
@@ -38,10 +38,10 @@ set( final_src ${calamaresSources} ${calamaresRc} ${trans_outfile} )
 add_executable( calamares_bin ${final_src} )
 set_target_properties(calamares_bin
     PROPERTIES
-        AUTOMOC TRUE
         ENABLE_EXPORTS TRUE
         RUNTIME_OUTPUT_NAME calamares
 )
+calamares_automoc( calamares_bin )
 
 if( WITH_KF5Crash )
     set( LINK_LIBRARIES
diff --git a/src/modules/contextualprocess/CMakeLists.txt b/src/modules/contextualprocess/CMakeLists.txt
index f75946b58..a7e9ed05b 100644
--- a/src/modules/contextualprocess/CMakeLists.txt
+++ b/src/modules/contextualprocess/CMakeLists.txt
@@ -21,5 +21,5 @@ if( ECM_FOUND AND BUILD_TESTING )
             Qt5::Core
             Qt5::Test
     )
-    set_target_properties( contextualprocesstest PROPERTIES AUTOMOC TRUE )
+    calamares_automoc( contextualprocesstest )
 endif()
diff --git a/src/modules/locale/CMakeLists.txt b/src/modules/locale/CMakeLists.txt
index 8faf8468c..affaa3753 100644
--- a/src/modules/locale/CMakeLists.txt
+++ b/src/modules/locale/CMakeLists.txt
@@ -54,7 +54,7 @@ if( ECM_FOUND AND BUILD_TESTING )
             ${geoip_libs}
             ${YAMLCPP_LIBRARY}
     )
-    set_target_properties( geoiptest PROPERTIES AUTOMOC TRUE )
+    calamares_automoc( geoiptest )
 
     ecm_add_test(
             Tests.cpp
@@ -65,10 +65,11 @@ if( ECM_FOUND AND BUILD_TESTING )
             calamares
             Qt5::Test
     )
-    set_target_properties( localetest PROPERTIES AUTOMOC TRUE )
+    calamares_automoc( localetest )
 endif()
 
 if( BUILD_TESTING )
     add_executable( test_geoip test_geoip.cpp ${geoip_src} )
     target_link_libraries( test_geoip calamaresui Qt5::Network ${geoip_libs} ${YAMLCPP_LIBRARY} )
+    calamares_automoc( test_geoip )
 endif()
diff --git a/src/modules/shellprocess/CMakeLists.txt b/src/modules/shellprocess/CMakeLists.txt
index 82ae8b911..166dff17d 100644
--- a/src/modules/shellprocess/CMakeLists.txt
+++ b/src/modules/shellprocess/CMakeLists.txt
@@ -20,5 +20,5 @@ if( ECM_FOUND AND BUILD_TESTING )
             Qt5::Core
             Qt5::Test
     )
-    set_target_properties( shellprocesstest PROPERTIES AUTOMOC TRUE )
+    calamares_automoc( shellprocesstest )
 endif()
diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt
index 207ffbb3a..d0e7b6d9d 100644
--- a/src/modules/users/CMakeLists.txt
+++ b/src/modules/users/CMakeLists.txt
@@ -51,5 +51,5 @@ if( ECM_FOUND AND BUILD_TESTING )
             Qt5::Test
             ${CRYPT_LIBRARIES}
     )
-    set_target_properties( passwordtest PROPERTIES AUTOMOC TRUE )
+    calamares_automoc( passwordtest )
 endif()