diff --git a/android/build.gradle b/android/build.gradle
index 942bf24..464b3b7 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -10,18 +10,20 @@ def pEpEngineDB = new File(new File(pEpEngineSrc), 'db')
 
 buildscript {
     repositories {
-        jcenter()
-        maven {url 'https://maven.google.com'}
+        //jcenter()
+        //maven {url 'https://maven.google.com'}
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-alpha8'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         //classpath 'com.android.tools.build:gradle:2.2.0'
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
+        //jcenter()
+        google()
     }
 }
 
diff --git a/androidTests/app/build.gradle b/androidTests/app/build.gradle
index da4b5ce..e9abca3 100644
--- a/androidTests/app/build.gradle
+++ b/androidTests/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion '25.0.0'
+    buildToolsVersion '25.0.2'
 
     defaultConfig {
         applicationId "pep.android.k9"
@@ -26,10 +26,11 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:23.0.0'
+    compile 'com.android.support:appcompat-v7:23.4.0'
     compile project(':pEpJNIAdapter')
     testCompile 'junit:junit:4.12'
-    compile 'com.jakewharton:butterknife:7.0.1'
+    compile 'com.jakewharton:butterknife:8.0.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.0.1'
     compile 'com.karumi:dexter:2.3.1'
     compile group: 'net.lingala.zip4j', name: 'zip4j', version: '1.3.1'
 }
diff --git a/androidTests/build.gradle b/androidTests/build.gradle
index e220da4..2540ef4 100644
--- a/androidTests/build.gradle
+++ b/androidTests/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0-alpha1'
+        classpath 'com.android.tools.build:gradle:3.0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files