diff --git a/runners/bookmarks/CMakeLists.txt b/runners/bookmarks/CMakeLists.txt
index 2c2bac1c1..ccb5d1e6a 100644
--- a/runners/bookmarks/CMakeLists.txt
+++ b/runners/bookmarks/CMakeLists.txt
@@ -1,49 +1,62 @@
 ########### next target ###############
 #set(EXTERNAL_LIBS KIOCore Qt5::Script KF5::Plasma Qt5::Sql)
 
 add_definitions(-DTRANSLATION_DOMAIN=\"plasma_runner_bookmarksrunner\")
 
 find_package(Qt5 CONFIG REQUIRED COMPONENTS Sql)
 
 
 set(EXTERNAL_LIBS
     Qt5::Sql
     KF5::KIOCore
     KF5::I18n
     KF5::Runner
     KF5::Bookmarks
 )
 
-set(krunner_bookmarksrunner_SRCS
-    browserfactory.cpp
+set(krunner_bookmarks_common_SRCS
     bookmarkmatch.cpp
     faviconfromblob.cpp
     favicon.cpp
     fetchsqlite.cpp
-    browsers/opera.cpp
-    bookmarksrunner.cpp
-    browsers/kdebrowser.cpp
-    browsers/firefox.cpp
 )
 
 set(krunner_bookmarksrunner_SRCS
-    ${krunner_bookmarksrunner_SRCS}
+    ${krunner_bookmarks_common_SRCS}
+    bookmarksrunner.cpp
+    browserfactory.cpp
     browsers/chromefindprofile.cpp
     browsers/chrome.cpp
+    browsers/firefox.cpp
+    browsers/kdebrowser.cpp
+    browsers/opera.cpp
 )
 
 
 add_library(krunner_bookmarksrunner MODULE ${krunner_bookmarksrunner_SRCS})
 target_link_libraries(krunner_bookmarksrunner ${EXTERNAL_LIBS})
 
+set(krunner_bookmarks_test_SRCS
+    ${krunner_bookmarks_common_SRCS}
+    browsers/chromefindprofile.cpp
+    browsers/chrome.cpp
+ )
+
+add_library(krunner_bookmarks_test STATIC ${krunner_bookmarks_test_SRCS})
+target_link_libraries(krunner_bookmarks_test
+    Qt5::Sql
+    KF5::KIOCore
+    KF5::Runner
+)
+
 install(TARGETS krunner_bookmarksrunner DESTINATION ${KDE_INSTALL_PLUGINDIR} )
 
 
 ########### install files ###############
 
 install(FILES plasma-runner-bookmarks.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 
 # Currently tests include only chrome, so no need to get include them if json is not found
 if(BUILD_TESTING)
    add_subdirectory(tests)
 endif()
diff --git a/runners/bookmarks/tests/CMakeLists.txt b/runners/bookmarks/tests/CMakeLists.txt
index 3423373cf..d7d8029d5 100644
--- a/runners/bookmarks/tests/CMakeLists.txt
+++ b/runners/bookmarks/tests/CMakeLists.txt
@@ -1,30 +1,8 @@
 
-include(ECMMarkAsTest)
+include(ECMAddTests)
 
-
-set( testChromeBookmarks_SRCS testchromebookmarks.cpp 
-  ../browsers/chrome.cpp
-  ../faviconfromblob.cpp
-  ../browsers/chromefindprofile.cpp
-  ../bookmarkmatch.cpp
-  ../favicon.cpp
-  ../fetchsqlite.cpp
-)
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/.. )
-add_executable( testChromeBookmarks ${testChromeBookmarks_SRCS} )
-#add_executable( testChromeBookmarksNAME plasma-runner-bookmarks-TestChromeBookmarks ${testChromeBookmarks_SRCS} )
-add_test(NAME testChromeBookmarks COMMAND testChromeBookmarks)
-ecm_mark_as_test(testChromeBookmarks)
-#add_test( testChromeBookmarks TESTNAME plasma-runner-bookmarks-TestChromeBookmarks ${testChromeBookmarks_SRCS} )
-target_link_libraries( testChromeBookmarks
-    Qt5::Gui
-    Qt5::Test
-    Qt5::Sql
-    KF5::Runner
-    KF5::KIOCore
+ecm_add_test(testchromebookmarks.cpp TEST_NAME testChromeBookmarks
+    LINK_LIBRARIES Qt5::Test krunner_bookmarks_test
 )
 
-add_test(NAME plasma-runner-bookmarks-TestChromeBookmarks COMMAND testChromeBookmarks)
-ecm_mark_as_test(testChromeBookmarks)
-
 file(COPY chrome-config-home DESTINATION ${CMAKE_CURRENT_BINARY_DIR})