diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b80c91..146e596 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,48 +1,50 @@
 project(angelfish)
 
 cmake_minimum_required(VERSION 2.8.12)
 set(KF5_MIN_VERSION "5.18.0")
 set(QT_MIN_VERSION "5.5.0")
 
 ################# Disallow in-source build #################
 
 if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
    message(FATAL_ERROR "This application requires an out of source build. Please create a separate build directory.")
 endif()
 
 include(FeatureSummary)
 
 ################# set KDE specific information #################
 
 find_package(ECM 0.0.8 REQUIRED NO_MODULE)
 
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
 include(ECMSetupVersion)
 include(ECMGenerateHeaders)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(ECMPoQmTools)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 
 ################# Find dependencies #################
 
 find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Svg QuickControls2 WebEngine)
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 Purpose)
 
 ################# Enable C++11 features for clang and gcc #################
 
 if(UNIX)
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++0x")
 endif()
 
 ################# build and install #################
 add_subdirectory(src)
-add_subdirectory(autotests)
+if (BUILD_TESTING)
+	add_subdirectory(autotests)
+endif()
 
 install(PROGRAMS org.kde.mobile.angelfish.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 install(FILES org.kde.mobile.angelfish.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 install(FILES org.kde.mobile.angelfish.svg DESTINATION ${KDE_INSTALL_FULL_ICONDIR}/hicolor/scalable/apps)
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/org.kde.mobile.angelfish.json b/org.kde.mobile.angelfish.json
index c8c2b67..c7a1b9d 100644
--- a/org.kde.mobile.angelfish.json
+++ b/org.kde.mobile.angelfish.json
@@ -1,39 +1,40 @@
 {
     "id": "org.kde.mobile.angelfish",
     "runtime": "org.kde.Platform",
     "runtime-version": "5.12",
     "sdk": "org.kde.Sdk",
     "command": "angelfish",
     "tags": ["nightly"],
     "desktop-file-name-suffix": " (Nightly)",
     "finish-args": [
         "--share=ipc",
         "--share=network",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri",
         "--filesystem=home",
         "--talk-name=org.freedesktop.Notifications"
     ],
     "separate-locales": false,
 
     "modules": [
         {
             "name": "purpose",
             "buildsystem": "cmake-ninja",
             "sources": [
                 {
                     "type": "git",
                     "url": "git://anongit.kde.org/purpose.git",
                     "tag": "v5.56.0"
                 }
             ]
         },
         {
             "name": "angelfish",
             "buildsystem": "cmake-ninja",
+            "config-opts": ["-DBUILD_TESTING=OFF"],
             "builddir": true,
             "sources": [ { "type": "dir", "path": ".", "skip": [".git"] } ]
         }
     ]
 }