diff --git a/.travis.yml b/.travis.yml
index 8b55db1e..3376d0ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,7 @@ before_script:
     && echo "$DEBUG_KEYSTORE" | base64 -d > $HOME/.android/debug.keystore
     || true
 
-script: cd android_app && ./gradlew testDebug assembleDebug
+script: cd android_app && ./gradlew testDebug assembleAndroidTest assembleDebug
 
 before_deploy:
   - ln -s app/build/outputs/apk/debug/app-debug.apk openScale-dev-build.apk
diff --git a/android_app/app/src/androidTest/java/com/health/openscale/gui/ScreenshotRecorder.java b/android_app/app/src/androidTest/java/com/health/openscale/gui/ScreenshotRecorder.java
index 2cb8f119..63914613 100644
--- a/android_app/app/src/androidTest/java/com/health/openscale/gui/ScreenshotRecorder.java
+++ b/android_app/app/src/androidTest/java/com/health/openscale/gui/ScreenshotRecorder.java
@@ -89,11 +89,12 @@ public class ScreenshotRecorder {
         openScale = OpenScale.getInstance(context);
 
         // Set first start to true to get the user add dialog
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        prefs.edit().putBoolean("firstStart", false).commit();
-        prefs.edit().putBoolean("waistEnable", true).commit();
-        prefs.edit().putBoolean("hipEnable", true).commit();
-        prefs.edit().putBoolean("boneEnable", true).commit();
+        PreferenceManager.getDefaultSharedPreferences(context).edit()
+                .putBoolean("firstStart", false)
+                .putBoolean("waistEnable", true)
+                .putBoolean("hipEnable", true)
+                .putBoolean("boneEnable", true)
+                .commit();
     }
 
     @Test
@@ -108,10 +109,13 @@ public class ScreenshotRecorder {
             throwable.printStackTrace();
         };
 
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
 
+        prefs.edit().remove("lastFragmentId").commit();
         setLangauge("en", "EN");
         screenshotRecorder();
 
+        prefs.edit().remove("lastFragmentId").commit();
         setLangauge("de", "DE");
         screenshotRecorder();
     }
@@ -232,7 +236,7 @@ public class ScreenshotRecorder {
             Thread.sleep(WAIT_MS);
             captureScreenshot("overview");
 
-            onView(withId(R.id.btnInsertData)).perform(click());
+            onView(withId(R.id.action_add_measurement)).perform(click());
 
             Thread.sleep(WAIT_MS);
             captureScreenshot("dataentry");