diff --git a/src/modules/netinstall/CMakeLists.txt b/src/modules/netinstall/CMakeLists.txt
index 1f8d11e22..3000ebf0e 100644
--- a/src/modules/netinstall/CMakeLists.txt
+++ b/src/modules/netinstall/CMakeLists.txt
@@ -21,10 +21,10 @@ calamares_add_plugin(netinstall
     SHARED_LIB
 )
 
-if(KF5CoreAddons_FOUND)
+if(TARGET ${kfname}::CoreAddons)
     calamares_add_test(
         netinstalltest
         SOURCES Tests.cpp Config.cpp LoaderQueue.cpp PackageTreeItem.cpp PackageModel.cpp
-        LIBRARIES ${qtname}::Gui ${qtname}::Network KF5::CoreAddons
+        LIBRARIES ${qtname}::Gui ${qtname}::Network ${kfname}::CoreAddons
     )
 endif()
diff --git a/src/modules/tracking/CMakeLists.txt b/src/modules/tracking/CMakeLists.txt
index 0dbbeb942..b54bd1430 100644
--- a/src/modules/tracking/CMakeLists.txt
+++ b/src/modules/tracking/CMakeLists.txt
@@ -17,7 +17,7 @@ calamares_add_plugin(tracking
         page_trackingstep.qrc
     SHARED_LIB
     LINK_LIBRARIES
-        KF5::CoreAddons
+        ${kfname}::CoreAddons
 )
 
 calamares_add_test(trackingtest SOURCES Tests.cpp Config.cpp)