diff --git a/.travis.yml b/.travis.yml
index 4658607..6570619 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -118,7 +118,7 @@ matrix:
       script:
         - npm i -g appium
         - cd tests && npm i
-        - travis_wait travis_retry npm run e2e -- --runType android24 --sauceLab --appPath $ANDROID_PACKAGE_JS
+        - travis_wait travis_retry npm run e2e -- --runType android28 --sauceLab --appPath $ANDROID_PACKAGE_JS
     - os: linux
       env:
         - Android="24"
@@ -129,7 +129,7 @@ matrix:
       script:
         - npm i -g appium
         - cd tests && npm i
-        - travis_wait travis_retry npm run e2e -- --runType android24 --sauceLab --appPath $ANDROID_PACKAGE_VUE
+        - travis_wait travis_retry npm run e2e -- --runType android28 --sauceLab --appPath $ANDROID_PACKAGE_VUE
     - os: linux
       env:
         - Android="24"
@@ -140,7 +140,7 @@ matrix:
       script:
         - npm i -g appium
         - cd tests && npm i
-        - travis_wait travis_retry npm run e2e -- --runType android24 --sauceLab --appPath $ANDROID_PACKAGE_NG
+        - travis_wait travis_retry npm run e2e -- --runType android28 --sauceLab --appPath $ANDROID_PACKAGE_NG
     - os: linux
       env:
         - iOS="12.0"
diff --git a/tests/e2e/config/appium.capabilities.json b/tests/e2e/config/appium.capabilities.json
index 1333fc5..0347667 100644
--- a/tests/e2e/config/appium.capabilities.json
+++ b/tests/e2e/config/appium.capabilities.json
@@ -36,6 +36,13 @@
                 "appium-version": "1.7.1",
                 "noReset": true
         },
+        "android28": {
+                "platformName": "Android",
+                "platformVersion": "9.0",
+                "deviceName": "Android GoogleAPI Emulator",
+                "appiumVersion": "1.9.1",
+                "noReset": true
+        },
         "sim11iPhone6": {
                 "platformName": "iOS",
                 "platformVersion": "11.0",
diff --git a/tests/e2e/test.e2e.ts b/tests/e2e/test.e2e.ts
index 5a56a2d..20ba1ce 100644
--- a/tests/e2e/test.e2e.ts
+++ b/tests/e2e/test.e2e.ts
@@ -57,26 +57,14 @@ describe("Imagepicker", async function () {
         const confirmButton = await driver.findElementByText(confirmButtonText);
         await confirmButton.click();
 
-        if (isAndroid) {
-            const imagesFolderXpath = await driver.elementHelper.getXPathByText(imagesFolderName, SearchOptions.contains);
-            await driver.driver.sleep(3000);
-            let imagesFolder = await driver.driver.elementByXPathIfExists(imagesFolderXpath, 10000);
-
-            if (isSauceRun && imagesFolder) {
-                await imagesFolder.click();
-                let dcimFolder = await driver.findElementByText("DCIM", SearchOptions.contains);
-                await dcimFolder.click();
-                imagesFolder = await driver.findElementByClassName(driver.locators.image);
-                await imagesFolder.click();
-            }
-        } else {
+        if (!isAndroid) {
             const cameraRollFolder = await driver.findElementByAccessibilityId(imagesFolderNameIos);
             await cameraRollFolder.click();
         }
 
         const imageLocator =  isAndroid ? "android.widget.ImageView" : "XCUIElementTypeCell";
-        const image = await driver.findElementByClassName(imageLocator);
-        await image.tap();
+        const images = await driver.findElementsByClassName(imageLocator);
+        await images[1].tap();
 
         pickSingleButton = await driver.findElementByText(pickSingleButtonText, SearchOptions.contains);
         expect(pickSingleButton).to.exist;
@@ -101,8 +89,8 @@ describe("Imagepicker", async function () {
 
         if (isAndroid) {
             const allImages = await driver.findElementsByClassName("android.widget.ImageView");
-            await allImages[5].hold(); // second Image
-            await allImages[2].click(); // first image
+            await allImages[1].hold(); // second Image
+            await allImages[4].click(); // first image
         } else {
             const allImages = await driver.findElementsByClassName("XCUIElementTypeCell");
             await allImages[0].click(); // first image