diff --git a/.travis.yml b/.travis.yml
index 0ec8e413..9761d9ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: android
 sudo: false
 cache: false
-jdk: oraclejdk7
+jdk: openjdk8
 env:
   global:
     - ANDROID_TARGET=android-23  
@@ -9,11 +9,14 @@ env:
     - ADB_INSTALL_TIMEOUT=20 # minutes (2 minutes by default)
     - ACDISPLAY_USE_TEST_KEY=true
 
+dist: trusty
+
+
 android:
   components:
     - platform-tools
     - tools
-    - build-tools-23.0.2
+    - build-tools-25.0.0
     - android-23
     # Extras
     - extra-android-m2repository
@@ -31,7 +34,7 @@ before_script:
 
   # Run emulator
   - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
-  - emulator -avd test -no-skin -no-audio -no-window &
+  - emulator -avd test -no-skin -no-window &
   - android-wait-for-emulator
   - adb shell input keyevent 82 &
 
diff --git a/project/app/build.gradle b/project/app/build.gradle
index 3fdf7c2b..d3abd376 100644
--- a/project/app/build.gradle
+++ b/project/app/build.gradle
@@ -56,7 +56,7 @@ repositories {
 }
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 25
     buildToolsVersion '25.0.0'
 
     lintOptions {
@@ -187,6 +187,7 @@ dependencies {
 
     // Testing-only dependencies
     //noinspection GradleDynamicVersion
+
     androidTestCompile 'com.android.support:support-annotations:25.+'
     androidTestCompile 'com.android.support.test:runner:0.4'
     androidTestCompile 'com.android.support.test:rules:0.4'