diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..0c106ec77
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,24 @@
+language: android
+sudo: false
+
+android:
+  components:
+    - tools
+    - platform-tools
+    - tools
+    - build-tools-25.0.3
+    - android-24
+    - android-25
+    - extra-android-m2repository
+    - sys-img-armeabi-v7a-android-24
+
+# Emulator Management: Create, Start and Wait
+before_script:
+  - echo no | android create avd --force -n test --target android-24 --abi armeabi-v7a
+  - emulator -avd test -no-skin -no-window &
+  - android-wait-for-emulator
+  - adb shell input keyevent 82 &
+
+script:
+  - android list target
+  - ./gradlew connectedAndroidTest
\ No newline at end of file
diff --git a/opentasks/build.gradle b/opentasks/build.gradle
index 17f70fcd5..1df2297aa 100644
--- a/opentasks/build.gradle
+++ b/opentasks/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'com.android.application'
 def gitCommitNo = { ->
     def stdout = new ByteArrayOutputStream()
     exec {
-        commandLine 'git', 'rev-list', '--count', 'master'
+        commandLine 'git', 'rev-list', '--count', 'HEAD'
         standardOutput = stdout
     }
     return Integer.parseInt(stdout.toString().trim())
@@ -17,7 +17,7 @@ android {
         applicationId "org.dmfs.tasks"
         minSdkVersion MIN_SDK_VERSION.toInteger()
         targetSdkVersion TARGET_SDK_VERSION.toInteger()
-        versionCode gitCommitNo()
+        versionCode gitCommitNo() * 10 // spread version code to allow inserting versions if necessary
         versionName version
     }
     buildTypes {