diff --git a/app/build.gradle b/app/build.gradle
index d512d75..6a800d3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -129,11 +129,10 @@ dependencies {
     compile 'at.blogc:expandabletextview:1.0.3'
     compile 'com.sothree.slidinguppanel:library:3.3.1'
 
-    androidTestCompile 'com.android.support.test:runner:0.5'
-    androidTestCompile 'com.android.support.test:rules:0.5'
+    androidTestCompile 'com.android.support.test:runner:1.0.1'
+    androidTestCompile 'com.android.support.test:rules:1.0.1'
     androidTestCompile 'org.hamcrest:hamcrest-library:1.3'
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
-    androidTestCompile 'com.android.support.test.espresso:espresso-idling-resource:2.2.2'
+    androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.1'
     androidTestCompile "com.android.support:support-v13:${supportLibVersion}"
     instrumentationTestCompile 'junit:junit:4.12'
 
diff --git a/app/src/androidTest/java/org/xbmc/kore/tests/ui/AbstractTestClass.java b/app/src/androidTest/java/org/xbmc/kore/tests/ui/AbstractTestClass.java
index 290dd27..66f09a8 100644
--- a/app/src/androidTest/java/org/xbmc/kore/tests/ui/AbstractTestClass.java
+++ b/app/src/androidTest/java/org/xbmc/kore/tests/ui/AbstractTestClass.java
@@ -19,7 +19,7 @@ package org.xbmc.kore.tests.ui;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.support.test.espresso.Espresso;
+import android.support.test.espresso.IdlingRegistry;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
 import android.support.v7.app.AppCompatActivity;
@@ -125,7 +125,7 @@ abstract public class AbstractTestClass<T extends AppCompatActivity> {
         configureHostInfo(hostInfo);
 
         loaderIdlingResource = new LoaderIdlingResource(activityTestRule.getActivity().getSupportLoaderManager());
-        Espresso.registerIdlingResources(loaderIdlingResource);
+        IdlingRegistry.getInstance().register(loaderIdlingResource);
 
         Utils.disableAnimations(context);
 
@@ -142,7 +142,7 @@ abstract public class AbstractTestClass<T extends AppCompatActivity> {
     @After
     public void tearDown() throws Exception {
         if ( loaderIdlingResource != null )
-            Espresso.unregisterIdlingResources(loaderIdlingResource);
+            IdlingRegistry.getInstance().unregister(loaderIdlingResource);
 
         applicationHandler.reset();
         playerHandler.reset();