diff --git a/F-Droid/build.gradle b/F-Droid/build.gradle
index bb10eb128..aac624a6b 100644
--- a/F-Droid/build.gradle
+++ b/F-Droid/build.gradle
@@ -167,6 +167,11 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
 
+    testOptions {
+        // prevent tests from dying on android.util.Log calls
+        unitTests.returnDefaultValues = true
+    }
+
     lintOptions {
         checkReleaseBuilds false
         abortOnError false
diff --git a/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java b/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java
index bfe234d09..bebd55977 100644
--- a/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java
+++ b/F-Droid/src/org/fdroid/fdroid/net/HttpDownloader.java
@@ -1,6 +1,5 @@
 package org.fdroid.fdroid.net;
 
-import android.text.TextUtils;
 import android.util.Log;
 
 import com.nostra13.universalimageloader.core.download.BaseImageDownloader;
@@ -108,8 +107,8 @@ public class HttpDownloader extends Downloader {
         // workaround until NetCipher supports HTTPS SNI
         // https://gitlab.com/fdroid/fdroidclient/issues/431
         if (connection instanceof HttpsURLConnection
-                && !TextUtils.equals(sourceUrl.getHost(), "f-droid.org")
-                && !TextUtils.equals(sourceUrl.getHost(), "guardianproject.info")) {
+                && "f-droid.org".equals(sourceUrl.getHost())
+                && "guardianproject.info".equals(sourceUrl.getHost())) {
             ((HttpsURLConnection) connection).setSSLSocketFactory(HttpsURLConnection.getDefaultSSLSocketFactory());
         }