diff --git a/CMakeLists.txt b/CMakeLists.txt
index 428c2a0..77e94ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,8 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED
              QuickWidgets
              Qml)
 
+find_package(Qt5Test ${REQUIRED_QT_VERSION})
+
 # KF5 dependencies
 
 find_package(KF5 ${KF5_VERSION} REQUIRED
@@ -51,7 +53,8 @@ include(FeatureSummary)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set_package_properties(FileMetaData PROPERTIES TYPE OPTIONAL PURPOSE "Required for file tagging")
+set_package_properties(KF5FileMetaData PROPERTIES TYPE OPTIONAL PURPOSE "Required for file tagging")
+set_package_properties(Qt5Test PROPERTIES TYPE OPTIONAL PURPOSE "Required to build tests")
 
 # add_subdirectory( doc )
 add_subdirectory( src )
diff --git a/src/libdanbooru/CMakeLists.txt b/src/libdanbooru/CMakeLists.txt
index 6a44f79..1d5a534 100644
--- a/src/libdanbooru/CMakeLists.txt
+++ b/src/libdanbooru/CMakeLists.txt
@@ -30,3 +30,7 @@ target_link_libraries(danbooru PUBLIC
 install(TARGETS danbooru ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 add_subdirectory(tests)
+
+if (Qt5Test_FOUND)
+    add_subdirectory(autotests)
+endif()