diff --git a/app/src/androidTest/java/org/isoron/uhabits/BaseTest.java b/app/src/androidTest/java/org/isoron/uhabits/BaseTest.java
index 1fac47da5..a73f5cd9d 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/BaseTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/BaseTest.java
@@ -20,6 +20,7 @@
 package org.isoron.uhabits;
 
 import android.content.Context;
+import android.os.Build;
 import android.os.Looper;
 import android.support.test.InstrumentationRegistry;
 
@@ -54,6 +55,12 @@ public class BaseTest
 
     protected void waitForAsyncTasks() throws InterruptedException, TimeoutException
     {
-        BaseTask.waitForTasks(30000);
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN)
+        {
+            Thread.sleep(1000);
+            return;
+        }
+
+        BaseTask.waitForTasks(10000);
     }
 }
diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/HabitsApplicationTest.java b/app/src/androidTest/java/org/isoron/uhabits/unit/HabitsApplicationTest.java
index 8bd20370f..6c1e669fb 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/unit/HabitsApplicationTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/unit/HabitsApplicationTest.java
@@ -19,6 +19,7 @@
 
 package org.isoron.uhabits.unit;
 
+import android.os.Build;
 import android.support.test.runner.AndroidJUnit4;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ -38,6 +39,9 @@ public class HabitsApplicationTest
     @Test
     public void getLogcat() throws IOException
     {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN)
+            return;
+
         String msg = "LOGCAT TEST";
         new RuntimeException(msg).printStackTrace();
 
diff --git a/app/src/androidTest/java/org/isoron/uhabits/unit/views/ViewTest.java b/app/src/androidTest/java/org/isoron/uhabits/unit/views/ViewTest.java
index b6099f9a6..d1953ff58 100644
--- a/app/src/androidTest/java/org/isoron/uhabits/unit/views/ViewTest.java
+++ b/app/src/androidTest/java/org/isoron/uhabits/unit/views/ViewTest.java
@@ -40,7 +40,7 @@ import static junit.framework.Assert.fail;
 
 public class ViewTest extends BaseTest
 {
-    protected static final double SIMILARITY_CUTOFF = 0.08;
+    protected static final double SIMILARITY_CUTOFF = 0.09;
     public static final int HISTOGRAM_BIN_SIZE = 8;
 
     protected void measureView(int width, int height, View view)
diff --git a/app/src/main/java/org/isoron/uhabits/tasks/BaseTask.java b/app/src/main/java/org/isoron/uhabits/tasks/BaseTask.java
index b1cc0058b..d9542c84b 100644
--- a/app/src/main/java/org/isoron/uhabits/tasks/BaseTask.java
+++ b/app/src/main/java/org/isoron/uhabits/tasks/BaseTask.java
@@ -20,6 +20,7 @@
 package org.isoron.uhabits.tasks;
 
 import android.os.AsyncTask;
+import android.os.Build;
 
 import java.util.concurrent.TimeoutException;
 
@@ -53,6 +54,9 @@ public abstract class BaseTask extends AsyncTask<Void, Integer, Void>
     public static void waitForTasks(long timeout)
             throws TimeoutException, InterruptedException
     {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN)
+            throw new UnsupportedOperationException("waitForTasks requires API 16+");
+
         int poolInterval = 100;
 
         while(timeout > 0)