diff --git a/app/build.gradle b/app/build.gradle
index a59f66e7..09917bc4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,13 +30,18 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:25.3.1'
+    implementation 'com.android.support:design:25.3.1'
+    implementation 'com.android.support:cardview-v7:25.3.1'
+    implementation project(':library')
+
+    // Testing-only dependencies
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation('com.android.support.test:runner:1.0.1', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:cardview-v7:25.3.1'
-    compile project(':library')
 }
diff --git a/app/src/androidTest/java/com/github/javiersantos/appupdater/NoUpdateAvailableTest.java b/app/src/androidTest/java/com/github/javiersantos/appupdater/NoUpdateAvailableTest.java
index f2207411..1aeb20a7 100644
--- a/app/src/androidTest/java/com/github/javiersantos/appupdater/NoUpdateAvailableTest.java
+++ b/app/src/androidTest/java/com/github/javiersantos/appupdater/NoUpdateAvailableTest.java
@@ -17,6 +17,7 @@
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 @RunWith(AndroidJUnit4.class)
 public class NoUpdateAvailableTest {
@@ -43,7 +44,7 @@ public void onSuccess(Update update, Boolean isUpdateAvailable) {
 
                             @Override
                             public void onFailed(AppUpdaterError error) {
-                                assertNotNull(error);
+                                assertTrue("Failed", false);
                                 signal.countDown();
                             }
                         })
@@ -73,7 +74,7 @@ public void onSuccess(Update update, Boolean isUpdateAvailable) {
 
                             @Override
                             public void onFailed(AppUpdaterError error) {
-                                assertNotNull(error);
+                                assertTrue("Failed", false);
                                 signal.countDown();
                             }
                         })
@@ -103,7 +104,7 @@ public void onSuccess(Update update, Boolean isUpdateAvailable) {
 
                             @Override
                             public void onFailed(AppUpdaterError error) {
-                                assertNotNull(error);
+                                assertTrue("Failed", false);
                                 signal.countDown();
                             }
                         })
@@ -133,7 +134,7 @@ public void onSuccess(Update update, Boolean isUpdateAvailable) {
 
                             @Override
                             public void onFailed(AppUpdaterError error) {
-                                assertNotNull(error);
+                                assertTrue("Failed", false);
                                 signal.countDown();
                             }
                         })
diff --git a/app/src/androidTest/java/com/github/javiersantos/appupdater/UpdateAvailableTest.java b/app/src/androidTest/java/com/github/javiersantos/appupdater/UpdateAvailableTest.java
index 6f17a889..0fc61bf5 100644
--- a/app/src/androidTest/java/com/github/javiersantos/appupdater/UpdateAvailableTest.java
+++ b/app/src/androidTest/java/com/github/javiersantos/appupdater/UpdateAvailableTest.java
@@ -42,7 +42,7 @@ public void onSuccess(Update update, Boolean isUpdateAvailable) {
 
                             @Override
                             public void onFailed(AppUpdaterError error) {
-                                assertNotNull(error);
+                                assertTrue("Failed", false);
                                 signal.countDown();
                             }
                         })
@@ -72,7 +72,7 @@ public void onSuccess(Update update, Boolean isUpdateAvailable) {
 
                             @Override
                             public void onFailed(AppUpdaterError error) {
-                                assertNotNull(error);
+                                assertTrue("Failed", false);
                                 signal.countDown();
                             }
                         })
@@ -102,7 +102,7 @@ public void onSuccess(Update update, Boolean isUpdateAvailable) {
 
                             @Override
                             public void onFailed(AppUpdaterError error) {
-                                assertNotNull(error);
+                                assertTrue("Failed", false);
                                 signal.countDown();
                             }
                         })
@@ -132,7 +132,7 @@ public void onSuccess(Update update, Boolean isUpdateAvailable) {
 
                             @Override
                             public void onFailed(AppUpdaterError error) {
-                                assertNotNull(error);
+                                assertTrue("Failed", false);
                                 signal.countDown();
                             }
                         })
@@ -161,7 +161,7 @@ public void onSuccess(Update update, Boolean isUpdateAvailable) {
 
                             @Override
                             public void onFailed(AppUpdaterError error) {
-                                assertNotNull(error);
+                                assertTrue("Failed", false);
                                 signal.countDown();
                             }
                         })
diff --git a/library/build.gradle b/library/build.gradle
index 142199aa..661cefc4 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -24,8 +24,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.squareup.okhttp3:okhttp:3.9.1'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:appcompat-v7:25.3.1'
+    implementation 'com.android.support:design:25.3.1'
+    implementation 'com.squareup.okhttp3:okhttp:3.9.1'
 }