diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c3b44fe..4e99f5b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,7 +111,7 @@ set(Boost_USE_STATIC_RUNTIME OFF)
 if(CUKE_ENABLE_BOOST_TEST)
     # "An external test runner utility is required to link with dynamic library" (Boost User's Guide)
     set(CMAKE_CXX_FLAGS "-DBOOST_TEST_DYN_LINK ${CMAKE_CXX_FLAGS}")
-    find_package(Boost 1.70 COMPONENTS unit_test_framework)
+    find_package(Boost 1.70 COMPONENTS unit_test_framework REQUIRED)
 endif()
 
 #
@@ -119,7 +119,7 @@ endif()
 #
 
 if(CUKE_ENABLE_GTEST)
-    find_package(GTest 1.11.0)
+    find_package(GTest 1.11.0 REQUIRED)
 endif()
 
 #
@@ -131,6 +131,7 @@ if(CUKE_ENABLE_QT)
     find_package(Qt5Gui)
     find_package(Qt5Widgets)
     find_package(Qt5Test)
+    find_package(Qt4 COMPONENTS QtCore QtGui QtTest)
 
     if(Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND)
         message(STATUS "Found Qt version: ${Qt5Core_VERSION_STRING}")
@@ -144,19 +145,19 @@ if(CUKE_ENABLE_QT)
             set_target_properties(Qt::Widgets PROPERTIES INTERFACE_LINK_LIBRARIES Qt5::Widgets)
             set_target_properties(Qt::Test    PROPERTIES INTERFACE_LINK_LIBRARIES Qt5::Test   )
         endif()
+    elseif(QT4_FOUND)
+        message(STATUS "Found Qt4")
+        add_library(Qt::Core    INTERFACE IMPORTED)
+        add_library(Qt::Gui     INTERFACE IMPORTED)
+        add_library(Qt::Widgets INTERFACE IMPORTED)
+        add_library(Qt::Test    INTERFACE IMPORTED)
+        set_target_properties(Qt::Core    PROPERTIES INTERFACE_LINK_LIBRARIES Qt4::QtCore)
+        set_target_properties(Qt::Gui     PROPERTIES INTERFACE_LINK_LIBRARIES Qt4::QtGui )
+        set_target_properties(Qt::Widgets PROPERTIES INTERFACE_LINK_LIBRARIES Qt4::QtGui )
+        set_target_properties(Qt::Test    PROPERTIES INTERFACE_LINK_LIBRARIES Qt4::QtTest)
+        include(${QT_USE_FILE})
     else()
-        find_package(Qt4 COMPONENTS QtCore QtGui QtTest)
-        if(QT4_FOUND)
-            add_library(Qt::Core    INTERFACE IMPORTED)
-            add_library(Qt::Gui     INTERFACE IMPORTED)
-            add_library(Qt::Widgets INTERFACE IMPORTED)
-            add_library(Qt::Test    INTERFACE IMPORTED)
-            set_target_properties(Qt::Core    PROPERTIES INTERFACE_LINK_LIBRARIES Qt4::QtCore)
-            set_target_properties(Qt::Gui     PROPERTIES INTERFACE_LINK_LIBRARIES Qt4::QtGui )
-            set_target_properties(Qt::Widgets PROPERTIES INTERFACE_LINK_LIBRARIES Qt4::QtGui )
-            set_target_properties(Qt::Test    PROPERTIES INTERFACE_LINK_LIBRARIES Qt4::QtTest)
-            include(${QT_USE_FILE})
-        endif()
+        message(FATAL_ERROR "Qt not found")
     endif()
 endif()
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7ec0e91f..8a66c56b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,3 +1,5 @@
+find_package(GTest REQUIRED)
+
 add_library(utils INTERFACE
     utils/HookRegistrationFixture.hpp
     utils/ContextManagerTestDouble.hpp