diff --git a/app/build.gradle b/app/build.gradle
index 03da57df7..2a5e4fd2c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,9 +55,9 @@ android {
 
 dependencies {
 
-    androidTestApt 'com.google.dagger:dagger-compiler:2.2'
+    androidTestApt 'com.google.dagger:dagger-compiler:2.11-rc2'
 
-    androidTestCompile 'com.android.support:support-annotations:25.3.0'
+    androidTestCompile 'com.android.support:support-annotations:25.3.1'
     androidTestCompile 'com.android.support.test:rules:0.5'
     androidTestCompile 'com.android.support.test:runner:0.5'
     androidTestCompile 'com.google.auto.factory:auto-factory:1.0-beta3'
@@ -66,40 +66,40 @@ dependencies {
     androidTestCompile 'org.mockito:mockito-core:1.10.19'
     androidTestCompile 'com.google.guava:guava:20.0'
 
-    apt 'com.google.dagger:dagger-compiler:2.2'
-    apt 'com.jakewharton:butterknife-compiler:8.0.1'
+    apt 'com.google.dagger:dagger-compiler:2.11-rc2'
+    apt 'com.jakewharton:butterknife-compiler:8.6.1-SNAPSHOT'
 
-    compile 'com.android.support:appcompat-v7:25.3.0'
-    compile 'com.android.support:design:25.3.0'
-    compile 'com.android.support:preference-v14:25.3.0'
-    compile 'com.android.support:support-v4:25.3.0'
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:design:25.3.1'
+    compile 'com.android.support:preference-v14:25.3.1'
+    compile 'com.android.support:support-v4:25.3.1'
     compile 'com.getpebble:pebblekit:3.0.0'
     compile 'com.github.paolorotolo:appintro:3.4.0'
     compile 'com.google.auto.factory:auto-factory:1.0-beta3'
-    compile 'com.google.dagger:dagger:2.2'
-    compile 'com.jakewharton:butterknife:8.0.1'
+    compile 'com.google.dagger:dagger:2.11-rc2'
+    compile 'com.jakewharton:butterknife:8.6.1-SNAPSHOT'
     compile 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT'
-    compile 'com.opencsv:opencsv:3.7'
-    compile 'org.apmem.tools:layouts:1.10@aar'
+    compile 'com.opencsv:opencsv:3.9'
+    compile 'org.apmem.tools:layouts:1.10'
     compile 'org.jetbrains:annotations-java5:15.0'
-    compile 'com.google.code.gson:gson:2.8.0'
-    compile 'com.google.code.findbugs:jsr305:2.0.1'
+    compile 'com.google.code.gson:gson:2.7'
+    compile 'com.google.code.findbugs:jsr305:3.0.2'
     compile 'com.google.guava:guava:20.0'
 
     provided 'javax.annotation:jsr250-api:1.0'
 
-    compile ('io.socket:socket.io-client:0.7.0') {
+    compile ('io.socket:socket.io-client:+') {
         exclude group: 'org.json', module: 'json'
     }
 
-    testApt 'com.google.dagger:dagger-compiler:2.2'
+    testApt 'com.google.dagger:dagger-compiler:2.11-rc2'
     testApt 'com.google.guava:guava:20.0'
 
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.hamcrest:hamcrest-library:1.3'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile 'junit:junit:5.0-SNAPSHOT'
+    testCompile 'org.hamcrest:hamcrest-library:1.4-atlassian-1'
+    testCompile 'org.mockito:mockito-core:2.8.9'
     testCompile 'org.json:json:20160810'
-    testCompile 'org.robolectric:robolectric:3.3.2'
+    testCompile 'org.robolectric:robolectric:3.4-rc2'
 }
 
 retrolambda {
diff --git a/app/src/test/java/org/isoron/uhabits/receivers/WidgetControllerTest.java b/app/src/test/java/org/isoron/uhabits/receivers/WidgetControllerTest.java
index 1e710c20b..b57b41cd7 100644
--- a/app/src/test/java/org/isoron/uhabits/receivers/WidgetControllerTest.java
+++ b/app/src/test/java/org/isoron/uhabits/receivers/WidgetControllerTest.java
@@ -50,6 +50,7 @@ public class WidgetControllerTest extends BaseUnitTest
 
         today = DateUtils.getStartOfToday();
         habit = fixtures.createEmptyHabit();
+        habitList.add(habit);
         commandRunner = mock(CommandRunner.class);
         notificationTray = mock(NotificationTray.class);
         controller = new WidgetController(commandRunner, notificationTray);
diff --git a/build.gradle b/build.gradle
index 1255b6627..16e4df7a8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,9 +5,9 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.2'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
-        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.5.2'
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.4'
         classpath 'me.tatarka:gradle-retrolambda:3.2.5'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
     }
diff --git a/run_tests b/run_tests
index 1bbc3236b..315d942cc 100755
--- a/run_tests
+++ b/run_tests
@@ -36,7 +36,7 @@ info() {
 }
 
 fail() {
-    $ADB shell reboot -p
+    $ADB emu kill
     exit 1
 }
 
@@ -92,7 +92,7 @@ info "Fetching logcat"
 $ADB logcat -d > ${OUTPUTS_DIR}/logcat.txt
 
 #--------------------------------------------------------------------------------
-info "Building coverage report"
+info "Running JVM tests"
 mkdir -p ${OUTPUTS_DIR}/code-coverage/connected/
 $ADB pull /data/user/0/${PACKAGE_NAME}/files/coverage.ec \
     ${OUTPUTS_DIR}/code-coverage/connected/