diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19ed4e9f..b3a080e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,10 +50,12 @@ if( WITH_TESTS )
     set(QT_USE_QTTEST TRUE)
 endif( WITH_TESTS )
 
-set(QT_MIN_VERSION "4.6.0")
-set(QT_USE_QTMAIN TRUE)
-find_package(Qt4 REQUIRED)
-include(${QT_USE_FILE})
+find_package(Qt4 4.6.0 REQUIRED QtCore QtGui QtTest)
+add_definitions(${QT_DEFINITIONS} -DQT_CORE_LIB -DQT_GUI_LIB)
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG QT_DEBUG)
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE QT_NO_DEBUG)
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO QT_NO_DEBUG)
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL QT_NO_DEBUG)
 
 find_package(Gcrypt REQUIRED)
 
@@ -73,7 +75,7 @@ if(NOT ZLIB_SUPPORTS_GZIP)
     message(FATAL_ERROR "zlib 1.2.x or higher is required to use the gzip format")
 endif(NOT ZLIB_SUPPORTS_GZIP)
 
-include_directories(${GCRYPT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
+include_directories(${QT_INCLUDE_DIR} ${GCRYPT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
 
 add_subdirectory(src)
 add_subdirectory(utils)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index c878c971..04d580f5 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -16,6 +16,8 @@
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src)
 
+add_definitions(-DQT_TEST_LIB)
+
 set( KEEPASSX_TEST_TREE ${CMAKE_SOURCE_DIR}/tests )
 configure_file( config-keepassx-tests.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-keepassx-tests.h )