diff --git a/build.gradle b/build.gradle
index 1c426ea026..822e90d2e9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -146,13 +146,6 @@ android {
         buildConfigField "String", "PUSH_URL", "\"https://textsecure-service.whispersystems.org\""
     }
 
-    productFlavors {
-        base { }
-        espresso {
-            testInstrumentationRunner "org.thoughtcrime.securesms.TextSecureWakingTestRunner"
-        }
-    }
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
@@ -210,16 +203,9 @@ android {
             res.srcDirs = ['res']
             assets.srcDirs = ['assets']
         }
-        espresso {
-            manifest.srcFile 'test/espresso/AndroidManifest.xml'
-        }
         androidTest {
             java.srcDirs = ['test/androidTest/java']
         }
-        androidTestEspresso {
-            java.srcDirs = ['test/androidTestEspresso/java']
-            res.srcDirs  = ['test/androidTestEspresso/res']
-        }
     }
 
      lintOptions {
@@ -257,3 +243,19 @@ if (propFile.canRead()){
     println 'signing.properties not found'
     android.buildTypes.release.signingConfig = null
 }
+
+if (project.hasProperty('espresso')) {
+    android.productFlavors {
+        base {}
+        espresso {
+            testInstrumentationRunner "org.thoughtcrime.securesms.TextSecureWakingTestRunner"
+        }
+    }
+    android.sourceSets.espresso {
+        manifest.srcFile 'test/espresso/AndroidManifest.xml'
+    }
+    android.sourceSets.androidTestEspresso {
+        java.srcDirs = ['test/androidTestEspresso/java']
+        res.srcDirs  = ['test/androidTestEspresso/res']
+    }
+}
\ No newline at end of file