diff --git a/.github/workflows/functional-test.yml b/.github/workflows/functional-test.yml
index 621f416e..882a00e7 100644
--- a/.github/workflows/functional-test.yml
+++ b/.github/workflows/functional-test.yml
@@ -85,7 +85,7 @@ jobs:
         nohup appium --use-plugins=images,execute-driver --relaxed-security --log-timestamp --log-no-colors 2>&1 > appium.log &
 
     - run: |
-        appium driver run xcuitest download-wda-sim  --platform=${{matrix.test_targets.platform}} --outdir=${{ github.workspace }}/wda
+        appium driver run xcuitest download-wda-sim --platform=${{matrix.test_targets.platform}} --outdir=${{github.workspace}}/wda
       name: Downloading prebuilt WDA
 
     - name: Set up Ruby
@@ -149,18 +149,19 @@ jobs:
         brew install applesimutils
 
     # Start Appium
+    - run: npm root -g
     - name: Install appium and mjpeg-consumer
       run: |
         npm install -g appium
         npm install -g mjpeg-consumer
     - run: |
         appium driver install xcuitest
-        appium plugin install images@2.1.8
+        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 --relaxed-security --log-timestamp --log-no-colors 2>&1 > appium.log &
 
     - run: |
-        appium driver run xcuitest download-wda-sim  --platform=${{matrix.test_targets.platform}} --outdir=${{ github.workspace }}/wda
+        appium driver run xcuitest download-wda-sim --platform=ios --outdir=${{github.workspace}}/wda
       name: Downloading prebuilt WDA
 
     - name: Set up Ruby
@@ -223,13 +224,12 @@ jobs:
           - target: test/functional/android/android/mjpeg_server_test.rb,test/functional/android/android/image_comparison_test.rb
             automation_name: espresso
             name: test10
-          # FIXME: rever the comment out after https://github.com/appium/appium/pull/21468
-          # - target: test/functional/android/webdriver/bidi_test.rb
-          #   automation_name: uiautomator2
-          #   name: test11
-          # - target: test/functional/android/webdriver/bidi_test.rb
-          #   automation_name: espresso
-          #   name: test12
+          - target: test/functional/android/webdriver/bidi_test.rb
+            automation_name: uiautomator2
+            name: test11
+          - target: test/functional/android/webdriver/bidi_test.rb
+            automation_name: espresso
+            name: test12
 
     env:
       API_LEVEL: 36
@@ -254,7 +254,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 --relaxed-security --log-timestamp --log-no-colors 2>&1 > appium.log &
 
     - name: Enable KVM group perms
       run: |