diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3bbe3b8..e4746b4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,101 +1,104 @@
 cmake_minimum_required(VERSION 3.0)
 
 project(plasma-networkmanagement)
 
 set(PROJECT_VERSION "5.14.80")
 set(PROJECT_VERSION_MAJOR 5)
 
 set(QT_MIN_VERSION "5.11.0")
 set(KF5_MIN_VERSION "5.50.0")
 
 ################# set KDE specific information #################
 
 find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 
 include(FeatureSummary)
 
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
     Core
     DBus
     Network
     Quick
     Widgets
-    Test
 )
 
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
     I18n
     WindowSystem
     Service
     Completion
     WidgetsAddons
     KIO
     CoreAddons
     Wallet
     ConfigWidgets
     IconThemes
     Solid
     DBusAddons
     Notifications
     Plasma
     Declarative
     NetworkManagerQt
 )
 
 find_package(KF5ModemManagerQt ${KF5_MIN_VERSION})
 set_package_properties(KF5ModemManagerQt PROPERTIES
                        TYPE OPTIONAL)
 
 # Required only for getting information about NetworkManager version in CMake
 find_package(NetworkManager 1.4.0)
 set_package_properties(NetworkManager PROPERTIES
                        TYPE REQUIRED)
 
 find_package(MobileBroadbandProviderInfo)
 set_package_properties(MobileBroadbandProviderInfo PROPERTIES
                        DESCRIPTION "Database of mobile broadband service providers"
                        URL "http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders"
                        TYPE OPTIONAL)
 
 find_package(Qca-qt5 2.1.0)
 set_package_properties(Qca-qt5 PROPERTIES DESCRIPTION "Support for encryption"
                        URL "http://download.kde.org/stable/qca-qt5/"
                        TYPE REQUIRED)
 
 if (DISABLE_MODEMMANAGER_SUPPORT)
     message(STATUS "Disabling ModemManager support")
     set(WITH_MODEMMANAGER_SUPPORT 0)
 else()
     if (KF5ModemManagerQt_FOUND)
         message(STATUS "Enabling ModemManager support")
         set(WITH_MODEMMANAGER_SUPPORT 1)
     else()
         message(STATUS "ModemManager or ModemManagerQt not found")
         set(WITH_MODEMMANAGER_SUPPORT 0)
     endif()
 endif()
 
 add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
 add_definitions(-DQT_USE_FAST_OPERATOR_PLUS)
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 
 remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY)
 
 add_definitions(-DWITH_MODEMMANAGER_SUPPORT=${WITH_MODEMMANAGER_SUPPORT})
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libs
                     ${CMAKE_CURRENT_SOURCE_DIR}/libs/editor/)
 
 add_subdirectory(applet)
 add_subdirectory(kded)
 add_subdirectory(kcm)
 add_subdirectory(libs)
 add_subdirectory(vpn)
-add_subdirectory(tests)
+
+# Enable unit testing
+if (BUILD_TESTING)
+    add_subdirectory(tests)
+endif ()
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3ccc74c8..f68327ec 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,30 +1,23 @@
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
+include_directories( ${CMAKE_SOURCE_DIR}/libs/editor )
 
 ########### next target ###############
 
 include(ECMAddTests)
 
+find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Test)
+set_package_properties(Qt5Test PROPERTIES PURPOSE "Required for autotests")
+
 ecm_add_test(
     simpleipv6test.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libs/editor/simpleipv6addressvalidator.cpp
-    TEST_NAME simpleipv6test
-    LINK_LIBRARIES Qt5::Test  Qt5::Widgets
+    LINK_LIBRARIES Qt5::Test plasmanm_editor
 )
 
 ecm_add_test(
     simpleipv4test.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libs/editor/simpleipv4addressvalidator.cpp
-    TEST_NAME simpleipv4test
-    LINK_LIBRARIES Qt5::Test  Qt5::Widgets
+    LINK_LIBRARIES Qt5::Test plasmanm_editor
 )
 
 ecm_add_test(
     simpleiplisttest.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libs/editor/simpleipv4addressvalidator.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libs/editor/simpleipv6addressvalidator.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libs/editor/simpleiplistvalidator.cpp
-    TEST_NAME simpleiplisttest
-    LINK_LIBRARIES Qt5::Test  Qt5::Widgets
+    LINK_LIBRARIES Qt5::Test plasmanm_editor
 )