diff --git a/.travis.yml b/.travis.yml
index 91e72165a2..c97d99f18b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,20 +15,24 @@ android:
     - tools
     - tools
     - platform-tools
-    - build-tools-25.0.0
-    - android-24
+    - build-tools-25.0.2
+    - android-23
     #- extra-google-google_play_services
     - extra-google-m2repository
     - extra-android-m2repository
     #- addon-google_apis-google-19
-    - sys-img-armeabi-v7a-android-24
-before_script:
-  - echo no | android create avd --force -n test -t android-24 --abi armeabi-v7a
-  - emulator -avd test -no-skin -no-audio -no-window &
-  - android-wait-for-emulator
-  - adb shell input keyevent 82 &
+#    - sys-img-armeabi-v7a-android-24
+  licenses:
+      - 'android-sdk-preview-license-.+'
+      - 'android-sdk-license-.+'
+      - 'google-gdk-license-.+'
+#before_script:
+#  - echo no | android create avd --force -n test -t android-24 --abi armeabi-v7a
+#  - emulator -avd test -no-skin -no-audio -no-window &
+#  - android-wait-for-emulator
+#  - adb shell input keyevent 82 &
 
 # Build
-script: ./gradlew build
+script: ./gradlew clean build
 
 
diff --git a/gradle.properties b/gradle.properties
index 3656ea7068..5046c4e509 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ PACKAGE=it.feio.android.omninotes
 
 MIN_SDK=14
 TARGET_SDK=23
-BUILD_TOOLS=25.0.0
+BUILD_TOOLS=25.0.2
 
 # The following properties are empty defaults to allow build and can EVENTUALLY be overridden to allow: