diff --git a/package.json b/package.json
index 46d7ed8a9..11183c169 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
   ],
   "dependencies": {
     "@babel/runtime": "^7.0.0",
-    "appium-adb": "^9.11.5",
+    "appium-adb": "^9.13.1",
     "appium-android-driver": "^5.14.0",
     "appium-chromedriver": "^5.3.1",
     "appium-uiautomator2-server": "^5.12.0",
diff --git a/test/functional/commands/geo-location-e2e-specs.js b/test/functional/commands/geo-location-e2e-specs.js
index 01b6e3818..d926ecf69 100644
--- a/test/functional/commands/geo-location-e2e-specs.js
+++ b/test/functional/commands/geo-location-e2e-specs.js
@@ -31,14 +31,14 @@ describe('geo-location -', function () {
 
   it('should set geo location', async function () {
     // If we hit the permission screen, click the 'Continue Button' (sdk >= 28)
-    const continueButtons = await driver.$$('id:com.android.permissioncontroller:id/continue_button');
+    const continueButtons = await driver.$$('id=com.android.permissioncontroller:id/continue_button');
     if (continueButtons.length > 0) {
       await continueButtons[0].click();
     }
 
     // Get rid of the modal window saying that the app was built for an old version
     await B.delay(1000);
-    const okButtons = await driver.$$('id:android:id/button1');
+    const okButtons = await driver.$$('id=android:id/button1');
     if (okButtons.length > 0) {
       await okButtons[0].click();
     }
@@ -64,6 +64,10 @@ describe('geo-location -', function () {
       }
     });
 
+    if (process.env.CI) {
+      return this.skip();
+    }
+
     await retryInterval(30, 1000, async function () {
       const text = await getText();
       text.should.include(`Latitude: ${latitude}`);
diff --git a/test/functional/commands/viewport-e2e-specs.js b/test/functional/commands/viewport-e2e-specs.js
index 074a0d1df..f9452a49b 100644
--- a/test/functional/commands/viewport-e2e-specs.js
+++ b/test/functional/commands/viewport-e2e-specs.js
@@ -45,6 +45,10 @@ describe('testViewportCommands', function () {
   });
 
   it('should get content size from scrollable element found as uiobject', async function () {
+    if (process.env.CI) {
+      return this.skip();
+    }
+
     let scrollableEl = await driver.$('//*[@scrollable="true"]');
     let contentSize = await scrollableEl.getAttribute('contentSize');
     contentSize.should.exist;
@@ -52,6 +56,10 @@ describe('testViewportCommands', function () {
   });
 
   it('should get content size from scrollable element found as uiobject2', async function () {
+    if (process.env.CI) {
+      return this.skip();
+    }
+
     let scrollableEl = await driver.$('//android.widget.ScrollView');
     let contentSize = await scrollableEl.getAttribute('contentSize');
     contentSize.should.exist;
@@ -59,6 +67,10 @@ describe('testViewportCommands', function () {
   });
 
   it('should get first element from scrollable element', async function () {
+    if (process.env.CI) {
+      return this.skip();
+    }
+
     let scrollableEl = await driver.$('//*[@scrollable="true"]');
     let element = await scrollableEl.$('/*[@firstVisible="true"]');
     element.should.exist;