diff --git a/build.gradle b/build.gradle
index c97858bf..735703c9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,9 +1,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.1.2'
     }
 }
 
@@ -11,6 +12,7 @@ apply plugin: 'com.android.library'
 
 repositories {
     jcenter()
+    google()
 }
 
 dependencies {
@@ -34,7 +36,7 @@ android {
         }
 
         // Move the tests to tests/java, tests/res, etc...
-        instrumentTest.setRoot('tests')
+        androidTest.setRoot('tests')
 
         // Move the build types to build-types/<type>
         // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
diff --git a/sample_client/build.gradle b/sample_client/build.gradle
index 2c7a6b08..1be2e8c5 100644
--- a/sample_client/build.gradle
+++ b/sample_client/build.gradle
@@ -24,7 +24,7 @@ android {
         }
 
         // Move the tests to tests/java, tests/res, etc...
-        instrumentTest.setRoot('tests')
+        androidTest.setRoot('tests')
 
         // Move the build types to build-types/<type>
         // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
diff --git a/test_client/build.gradle b/test_client/build.gradle
index 319d157b..e9a8c6aa 100644
--- a/test_client/build.gradle
+++ b/test_client/build.gradle
@@ -26,7 +26,7 @@ android {
         }
 
         // Move the tests to tests/java, tests/res, etc...
-        instrumentTest.setRoot('tests')
+        androidTest.setRoot('tests')
 
         // Move the build types to build-types/<type>
         // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
diff --git a/test_client/tests/build.gradle b/test_client/tests/build.gradle
index b9a2b5a1..4b423aab 100644
--- a/test_client/tests/build.gradle
+++ b/test_client/tests/build.gradle
@@ -21,7 +21,7 @@ android {
         }
 
         // Move the tests to tests/java, tests/res, etc...
-        instrumentTest.setRoot('tests')
+        androidTest.setRoot('tests')
 
         // Move the build types to build-types/<type>
         // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...