diff --git a/.travis.yml b/.travis.yml
index fd6e55ea7..673dd3876 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,6 @@ before_install:
     - ./install-custom-gradle-test-plugin.sh
 install: echo "Installation done"
 script:
-    - gradle assemble -S -q
-    - gradle --info OpenKeychain-Test:testDebug
+    - gradle -PwithTesting=true assemble -S -q
+    - gradle -PwithTesting=true --info OpenKeychain-Test:testDebug
 
diff --git a/settings.gradle b/settings.gradle
index 86088e04a..47385ed14 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
 include ':OpenKeychain'
-include ':OpenKeychain-Test'
+if (hasProperty('withTesting') && withTesting) include ':OpenKeychain-Test'
 include ':extern:openpgp-api-lib'
 include ':extern:openkeychain-api-lib'
 include ':extern:html-textview'