diff --git a/.travis.yml b/.travis.yml
index 4f0fe45..949fa78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,27 @@
 language: android
+
 android:
   components:
     - platform-tools
     - tools
+    
+    # The BuildTools version used by your project
     - build-tools-23.0.3
-    - android-23
+    
+    # The SDK version used to compile your project
+    - android-24
+ 
+    # Additional components
+    - extra-google-google_play_services
+    - extra-google-m2repository
+    - extra-android-m2repository    
+    - sys-img-armeabi-v7a-android-24
 
-script:
-   - ./gradlew build assembleRelease
\ No newline at end of file
+before_script:
+  # Create and start emulator
+  - 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 &
+
+script: ./gradlew assembleRelease connectedAndroidTest
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 4842e9a..2f13dec 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.2"
 
     defaultConfig {
         applicationId "org.hitlabnz.sensor_fusion_demo"
         minSdkVersion 18
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 4
         versionName "1.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -22,12 +22,12 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:23.3.0'
+    compile 'com.android.support:support-v4:24.2.1'
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:1.10.19'
 
-    androidTestCompile 'com.android.support:support-annotations:23.3.0'
+    androidTestCompile 'com.android.support:support-annotations:24.2.1'
     androidTestCompile 'com.android.support.test:runner:0.4.1'
     androidTestCompile 'com.android.support.test:rules:0.4.1'
     androidTestCompile 'org.hamcrest:hamcrest-library:1.3'