diff --git a/build.gradle b/build.gradle
index da65ae9c..15e8f233 100644
--- a/build.gradle
+++ b/build.gradle
@@ -98,8 +98,9 @@ dependencies {
     androidTestCompile 'com.android.support:support-v4:22.2.0'
     androidTestCompile 'com.android.support:support-annotations:22.2.0'
 
-    androidTestCompile 'com.android.support.test:testing-support-lib:0.1'
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.0'
+    androidTestCompile 'com.android.support.test:runner:0.3'
+    androidTestCompile 'com.android.support.test:rules:0.3'
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2'
 
     androidTestCompile 'com.squareup.spoon:spoon-client:1.1.10'
     androidTestCompile 'com.squareup.assertj:assertj-android:1.0.0'
diff --git a/src/androidTest/java/org/ligi/passandroid/reporting/SpooningFailureHandler.java b/src/androidTest/java/org/ligi/passandroid/reporting/SpooningFailureHandler.java
index 807fc80c..9af5eadd 100644
--- a/src/androidTest/java/org/ligi/passandroid/reporting/SpooningFailureHandler.java
+++ b/src/androidTest/java/org/ligi/passandroid/reporting/SpooningFailureHandler.java
@@ -1,13 +1,13 @@
 package org.ligi.passandroid.reporting;
 
 import android.app.Activity;
-import android.support.test.internal.runner.lifecycle.ActivityLifecycleMonitorRegistry;
+import android.support.test.espresso.FailureHandler;
+import android.support.test.espresso.base.DefaultFailureHandler;
+import android.support.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
 import android.support.test.runner.lifecycle.Stage;
 import android.test.InstrumentationTestCase;
 import android.view.View;
 
-import android.support.test.espresso.FailureHandler;
-import android.support.test.espresso.base.DefaultFailureHandler;
 import com.squareup.spoon.Spoon;
 
 import org.hamcrest.Matcher;