diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 9b72c037..8e4e62af 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -1,155 +1,156 @@
 find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test)
 
 include(ECMMarkAsTest)
 include(ECMAddTests)
 
 remove_definitions(-DQT_NO_CAST_FROM_ASCII)
 
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 
 include_directories(
   # for config.h
   ${CMAKE_BINARY_DIR}
 
   # for generated ktexteditor headers
   ${CMAKE_BINARY_DIR}/src/include
 
   # for normal sources
   ${CMAKE_SOURCE_DIR}/src
   ${CMAKE_SOURCE_DIR}/src/include
   ${CMAKE_SOURCE_DIR}/src/buffer
   ${CMAKE_SOURCE_DIR}/src/completion
   ${CMAKE_SOURCE_DIR}/src/dialogs
   ${CMAKE_SOURCE_DIR}/src/document
   ${CMAKE_SOURCE_DIR}/src/script
   ${CMAKE_SOURCE_DIR}/src/mode
   ${CMAKE_SOURCE_DIR}/src/render
   ${CMAKE_SOURCE_DIR}/src/search
   ${CMAKE_SOURCE_DIR}/src/syntax
   ${CMAKE_SOURCE_DIR}/src/undo
   ${CMAKE_SOURCE_DIR}/src/utils
   ${CMAKE_SOURCE_DIR}/src/view
 )
 
 add_definitions(-DTEST_DATA_DIR=\"${CMAKE_SOURCE_DIR}/autotests/input/\")
 add_definitions(-DJS_DATA_DIR=\"${CMAKE_SOURCE_DIR}/src/script/data/\")
 
 set (KTEXTEDITOR_TEST_LINK_LIBS KF5TextEditor
   KF5::I18n
   KF5::IconThemes
   KF5::GuiAddons
+  KF5::SyntaxHighlighting
   Qt5::Qml
 )
 
 include(ECMMarkAsTest)
 
 # test executable for encoding
 add_executable(kateencodingtest src/kateencodingtest.cpp)
 target_link_libraries(kateencodingtest ${KTEXTEDITOR_TEST_LINK_LIBS})
 ecm_mark_as_test(kateencodingtest)
 
 # test macro for encoding tests
 MACRO(KTEXTEDITOR_ENCODING_TEST _encoding _testname)
   ADD_TEST (NAME encoding_${_testname}_create COMMAND kateencodingtest ${_encoding} ${CMAKE_SOURCE_DIR}/autotests/input/encoding/${_testname} ${CMAKE_CURRENT_BINARY_DIR}/${_testname} )
   ADD_TEST (NAME encoding_${_testname}_diff COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_SOURCE_DIR}/autotests/input/encoding/${_testname} ${CMAKE_CURRENT_BINARY_DIR}/${_testname} )
 ENDMACRO(KTEXTEDITOR_ENCODING_TEST)
 
 # add tests
 
 # this file is utf-8, simple
 KTEXTEDITOR_ENCODING_TEST ("utf-8" "utf8.txt")
 
 # this file is latin15, but fallback should work!
 KTEXTEDITOR_ENCODING_TEST ("utf-8" "latin15.txt")
 
 # this file is utf32, little endian, but fallback should work!
 KTEXTEDITOR_ENCODING_TEST ("utf-8" "utf32.txt")
 
 # this file is utf16, little endian, but fallback should work!
 KTEXTEDITOR_ENCODING_TEST ("utf-8" "utf16.txt")
 
 # this file is utf32, big endian, but fallback should work!
 KTEXTEDITOR_ENCODING_TEST ("utf-8" "utf32be.txt")
 
 # this file is utf16, big endian, but fallback should work!
 KTEXTEDITOR_ENCODING_TEST ("utf-8" "utf16be.txt")
 
 # cyrillic utf-8
 KTEXTEDITOR_ENCODING_TEST ("utf-8" "cyrillic_utf8.txt")
 
 # cyrillic cp1251
 KTEXTEDITOR_ENCODING_TEST ("utf-8" "cp1251.txt")
 
 # cyrillic koi8-r
 KTEXTEDITOR_ENCODING_TEST ("utf-8" "koi8-r.txt")
 
 # one character latin-15 test, segfaulted
 KTEXTEDITOR_ENCODING_TEST ("utf-8" "one-char-latin-15.txt")
 
 # test executable for indentation
 add_executable(kateindenttest src/indenttest.cpp src/script_test_base.cpp src/testutils.cpp)
 target_link_libraries(kateindenttest ${KTEXTEDITOR_TEST_LINK_LIBS}
     Qt5::Test)
 ecm_mark_as_test(kateindenttest)
 
 # test macro for indentation tests
 MACRO(KTEXTEDITOR_INDENT_TEST _testname)
   ADD_TEST (NAME kateindenttest_${_testname} COMMAND kateindenttest ${_testname})
 ENDMACRO(KTEXTEDITOR_INDENT_TEST)
 
 # test different indenters sepearately to have smaller test chunks, that takes LONG
 KTEXTEDITOR_INDENT_TEST ("testPython")
 KTEXTEDITOR_INDENT_TEST ("testCstyle")
 KTEXTEDITOR_INDENT_TEST ("testCppstyle")
 KTEXTEDITOR_INDENT_TEST ("testCMake")
 KTEXTEDITOR_INDENT_TEST ("testRuby")
 KTEXTEDITOR_INDENT_TEST ("testHaskell")
 KTEXTEDITOR_INDENT_TEST ("testLatex")
 KTEXTEDITOR_INDENT_TEST ("testPascal")
 KTEXTEDITOR_INDENT_TEST ("testAda")
 KTEXTEDITOR_INDENT_TEST ("testXml")
 KTEXTEDITOR_INDENT_TEST ("testNormal")
 KTEXTEDITOR_INDENT_TEST ("testReplicode")
 
 macro(ktexteditor_unit_test testname)
   ecm_add_test(src/${testname}.cpp ${ARGN}
                TEST_NAME ${testname}
 	       LINK_LIBRARIES ${KTEXTEDITOR_TEST_LINK_LIBS} Qt5::Test)
 endmacro()
 
 ecm_add_tests(
   src/katetextbuffertest.cpp
   src/range_test.cpp
   src/undomanager_test.cpp
   src/plaintextsearch_test.cpp
   src/regexpsearch_test.cpp
   src/scriptdocument_test.cpp
   src/wordcompletiontest.cpp
   src/searchbar_test.cpp
   src/movingcursor_test.cpp
   src/configinterface_test.cpp
   src/messagetest.cpp
   src/kte_documentcursor.cpp
   src/bug313769.cpp
   src/katedocument_test.cpp
   src/movingrange_test.cpp
   src/kateview_test.cpp
   src/revision_test.cpp
   src/modificationsystem_test.cpp
   src/templatehandler_test.cpp
   src/katefoldingtest.cpp
   src/bug286887.cpp
   src/katewildcardmatcher_test.cpp
   LINK_LIBRARIES ${KTEXTEDITOR_TEST_LINK_LIBS} Qt5::Test
 )
 
 ktexteditor_unit_test(completion_test src/codecompletiontestmodel.cpp src/codecompletiontestmodels.cpp)
 ktexteditor_unit_test(commands_test src/script_test_base.cpp src/testutils.cpp)
 ktexteditor_unit_test(scripting_test src/script_test_base.cpp src/testutils.cpp)
 ktexteditor_unit_test(bug313759 src/testutils.cpp)
 ktexteditor_unit_test(bug317111 src/testutils.cpp)
 ktexteditor_unit_test(bug205447 src/testutils.cpp)
 
 if (BUILD_VIMODE)
   add_subdirectory(src/vimode)
 endif()
diff --git a/autotests/src/vimode/CMakeLists.txt b/autotests/src/vimode/CMakeLists.txt
index ee34042a..4e9a38b4 100644
--- a/autotests/src/vimode/CMakeLists.txt
+++ b/autotests/src/vimode/CMakeLists.txt
@@ -1,25 +1,26 @@
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
 
 include_directories(
   ${CMAKE_SOURCE_DIR}/src/vimode
 )
 
 set (VIMODE_TEST_LINK_LIBS KF5TextEditor
   KF5::I18n
+  KF5::SyntaxHighlighting
   Qt5::Qml
   Qt5::Test
 )
 
 macro(vimode_unit_test)
   ecm_add_test(${ARGN} TEST_NAME "vimode_${ARGV0}"
                LINK_LIBRARIES ${VIMODE_TEST_LINK_LIBS})
 endmacro()
 
 
 vimode_unit_test(modes modes.cpp base.cpp)
 vimode_unit_test(view view.cpp base.cpp)
 vimode_unit_test(completion completion.cpp base.cpp fakecodecompletiontestmodel.cpp)
 vimode_unit_test(keys keys.cpp base.cpp fakecodecompletiontestmodel.cpp emulatedcommandbarsetupandteardown.cpp)
 vimode_unit_test(emulatedcommandbar emulatedcommandbar.cpp base.cpp fakecodecompletiontestmodel.cpp emulatedcommandbarsetupandteardown.cpp)
 
 add_custom_target(vimode_tests ${CMAKE_CTEST_COMMAND} --force-new-ctest-process -R "^vimode_")
diff --git a/src/part/CMakeLists.txt b/src/part/CMakeLists.txt
index 289714fc..d2a3b25a 100644
--- a/src/part/CMakeLists.txt
+++ b/src/part/CMakeLists.txt
@@ -1,12 +1,12 @@
 # kate part itself just is core + the factory
 add_library (katepart MODULE katepart.cpp)
 
 # service => json and install
 kcoreaddons_desktop_to_json (katepart katepart.desktop SERVICE_TYPES kpart.desktop)
 install( FILES katepart.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
 
 # link the part, use kate part core + kde stuff
-target_link_libraries (katepart KF5TextEditor)
+target_link_libraries (katepart KF5TextEditor KF5::SyntaxHighlighting)
 
 # install the part
 install (TARGETS katepart DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/parts)