diff --git a/.github/workflows/functional-test.yml b/.github/workflows/functional-test.yml
index d7fcf0c9..df905b3e 100644
--- a/.github/workflows/functional-test.yml
+++ b/.github/workflows/functional-test.yml
@@ -68,7 +68,7 @@ jobs:
         appium driver install xcuitest
         appium plugin install images
         appium plugin install execute-driver
-        nohup appium --use-plugins=images,execute-driver --relaxed-security --log-timestamp --log-no-colors 2>&1 > appium.log &
+        nohup appium --use-plugins=images,execute-driver --base-path=/wd/hub --relaxed-security --log-timestamp --log-no-colors 2>&1 > appium.log &
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
@@ -131,7 +131,7 @@ jobs:
         appium driver install xcuitest
         appium plugin install images@2.1.8
         appium plugin install execute-driver
-        nohup appium --use-plugins=images,execute-driver --relaxed-security --log-timestamp --log-no-colors > appium.log &
+        nohup appium --use-plugins=images,execute-driver --base-path=/wd/hub --relaxed-security --log-timestamp --log-no-colors > appium.log &
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
@@ -216,7 +216,7 @@ jobs:
         appium driver install ${{matrix.test_targets.automation_name}}
         appium plugin install images
         appium plugin install execute-driver
-        nohup appium --use-plugins=images,execute-driver --relaxed-security --log-timestamp --log-no-colors > appium.log &
+        nohup appium --use-plugins=images,execute-driver --base-path=/wd/hub --relaxed-security --log-timestamp --log-no-colors > appium.log &
 
     - name: Enable KVM group perms
       run: |
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 85cdacc6..aba04b3f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -101,6 +101,10 @@ def self.appium_version
   end
 
   class Caps
+    def ci?
+      ENV['CI'] == 'true'
+    end
+
     def self.ios(platform_name = :ios)
       new.ios(platform_name)
     end
@@ -158,6 +162,7 @@ def ios(platform_name = :ios)
           'settings[pageSourceExcludedAttributes]': 'visible'
         },
         appium_lib: {
+          server_url: ci? ? 'http://127.0.0.1:4723/wd/hub' : nil,
           wait_timeout: 20,
           wait_interval: 1
         }
@@ -298,6 +303,7 @@ def android(activity_name = nil)
           uiautomator2ServerLaunchTimeout: 60_000 # ms
         },
         appium_lib: {
+          server_url: ci? ? 'http://127.0.0.1:4723/wd/hub' : nil,
           wait: 5,
           wait_timeout: 20,
           wait_interval: 1