diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d03fbff..cfa4619b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,8 +26,6 @@ find_package(KF5 CONFIG REQUIRED
 )
 find_package(KDE4Support NO_MODULE)
 set_package_properties(KDE4Support PROPERTIES TYPE REQUIRED)
-find_package(KDELibs4 NO_MODULE) #needed for KDE4Support
-set_package_properties(KDELibs4 PROPERTIES TYPE REQUIRED)
 find_package(Qt5Transitional MODULE)
 set_package_properties(Qt5Transitional PROPERTIES TYPE REQUIRED)
 remove_definitions(-DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_NO_CAST_FROM_ASCII)
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 4917f83c..66dc36c8 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -9,7 +9,7 @@ set(KONSOLE_TEST_LIBS Qt5::Test konsoleprivate)
 ##  since make test is supposed to be fully automated.
 
 kde4_add_executable(PartManualTest TEST PartManualTest.cpp)
-target_link_libraries(PartManualTest XmlGui KParts KPty
+target_link_libraries(PartManualTest KF5::XmlGui KF5::KParts KF5::KPty
                                ${KONSOLE_TEST_LIBS})
 
 kde4_add_unit_test(CharacterColorTest CharacterColorTest.cpp)
@@ -29,7 +29,7 @@ target_link_libraries(KeyboardTranslatorTest ${KONSOLE_TEST_LIBS})
 
 if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     kde4_add_unit_test(PartTest PartTest.cpp)
-    target_link_libraries(PartTest XmlGui KParts KPty
+    target_link_libraries(PartTest KF5::XmlGui KF5::KParts KF5::KPty
                                ${KONSOLE_TEST_LIBS})
 endif()
 
@@ -37,7 +37,7 @@ kde4_add_unit_test(ProfileTest ProfileTest.cpp)
 target_link_libraries(ProfileTest ${KONSOLE_TEST_LIBS})
 
 kde4_add_unit_test(PtyTest PtyTest.cpp)
-target_link_libraries(PtyTest KPty ${KONSOLE_TEST_LIBS})
+target_link_libraries(PtyTest KF5::KPty ${KONSOLE_TEST_LIBS})
 
 ##kde4_add_unit_test(SessionManagerTest SessionManagerTest.cpp)
 ##target_link_libraries(SessionManagerTest ${KONSOLE_TEST_LIBS})