diff --git a/build.gradle b/build.gradle
index 822e90d2e9..9bc926d715 100644
--- a/build.gradle
+++ b/build.gradle
@@ -244,7 +244,12 @@ if (propFile.canRead()){
     android.buildTypes.release.signingConfig = null
 }
 
-if (project.hasProperty('espresso')) {
+if (project.hasProperty('espresso') && System.console() != null) {
+    println '____________________WARNING_____________________'
+    println 'ALL YOUR CONTACTS WILL BE DELETED IN THE PROCESS'
+    println 'OF RUNNING THESE TESTS, TYPE ENTER TO CONTINUE'
+    System.console().readLine(':')
+
     android.productFlavors {
         base {}
         espresso {
@@ -258,4 +263,4 @@ if (project.hasProperty('espresso')) {
         java.srcDirs = ['test/androidTestEspresso/java']
         res.srcDirs  = ['test/androidTestEspresso/res']
     }
-}
\ No newline at end of file
+}
diff --git a/test/androidTestEspresso/java/org/thoughtcrime/securesms/TextSecureEspressoTestCase.java b/test/androidTestEspresso/java/org/thoughtcrime/securesms/TextSecureEspressoTestCase.java
index 05f603af6b..af19885a2c 100644
--- a/test/androidTestEspresso/java/org/thoughtcrime/securesms/TextSecureEspressoTestCase.java
+++ b/test/androidTestEspresso/java/org/thoughtcrime/securesms/TextSecureEspressoTestCase.java
@@ -108,7 +108,7 @@ public class TextSecureEspressoTestCase<T extends Activity> extends ActivityInst
     pstnNumber       = pstnString.split(":")[1];
     verificationCode = RegistrationBypassUtil.getVerificationCodeForPstnString(context, pstnString);
 
-    Log.d(TAG, "using pstn id of " + pstnString + " with verification code " + verificationCode);
+    Log.d(TAG, "using pstn string of " + pstnString);
   }
 
   @Override