diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d5b11682d..1df476302 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -192,7 +192,7 @@ jobs:
 
     - name: Download prebuilt WDA
       if: matrix.e2e-tests == 'ios' || matrix.e2e-tests == 'flutter-ios'
-      run: appium driver run xcuitest download-wda-sim  --platform=ios --outdir=$(dirname "$PREBUILT_WDA_PATH")
+      run: appium driver run xcuitest download-wda -- --platform=ios --kind=sim --outdir=$(dirname "$PREBUILT_WDA_PATH")
 
     - name: Run iOS E2E tests
       if: matrix.e2e-tests == 'ios'
diff --git a/src/test/java/io/appium/java_client/utils/TestUtils.java b/src/test/java/io/appium/java_client/utils/TestUtils.java
index 8aa90892c..00277a0d4 100644
--- a/src/test/java/io/appium/java_client/utils/TestUtils.java
+++ b/src/test/java/io/appium/java_client/utils/TestUtils.java
@@ -37,7 +37,7 @@ public class TestUtils {
     public static final String IOS_SIM_VODQA_RELEASE_URL =
             "https://github.com/appium/VodQAReactNative/releases/download/v1.2.3/VodQAReactNative-simulator-release.zip";
     public static final String ANDROID_APIDEMOS_APK_URL =
-            "https://github.com/appium/android-apidemos/releases/download/v6.0.2/ApiDemos-debug.apk";
+            "https://github.com/appium/appium-android/releases/download/android-apidemos@6.1.2/ApiDemos-debug.apk";
 
     private TestUtils() {
     }