diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index 85cef8241..f0168d025 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -189,20 +189,35 @@ jobs:
       - if: github.event_name == 'pull_request'
         uses: ./.github/actions/save-pr-number
 
-      - name: Build Instrumentation Tests, copy to platform/android
+      - name: Build Instrumentation Tests (OpenGL), copy to platform/android
         run: |
           ./gradlew assembleOpenglDebug assembleOpenglDebugAndroidTest -PtestBuildType=debug
-          cp MapLibreAndroidTestApp/build/outputs/apk/opengl/debug/MapLibreAndroidTestApp-opengl-debug.apk InstrumentationTestApp.apk
-          cp MapLibreAndroidTestApp/build/outputs/apk/androidTest/opengl/debug/MapLibreAndroidTestApp-opengl-debug-androidTest.apk InstrumentationTests.apk
+          cp MapLibreAndroidTestApp/build/outputs/apk/opengl/debug/MapLibreAndroidTestApp-opengl-debug.apk InstrumentationTestAppOpenGL.apk
+          cp MapLibreAndroidTestApp/build/outputs/apk/androidTest/opengl/debug/MapLibreAndroidTestApp-opengl-debug-androidTest.apk InstrumentationTestsOpenGL.apk
 
-      - name: Upload android-ui-test
+      - name: Upload android-ui-test-opengl
         uses: actions/upload-artifact@v4
         with:
           if-no-files-found: error
-          name: android-ui-test
+          name: android-ui-test-opengl
           path: |
-            platform/android/InstrumentationTestApp.apk
-            platform/android/InstrumentationTests.apk
+            platform/android/InstrumentationTestAppOpenGL.apk
+            platform/android/InstrumentationTestsOpenGL.apk
+
+      - name: Build Instrumentation Tests, copy to platform/android
+        run: |
+          ./gradlew assembleVulkanDebug assembleVulkanDebugAndroidTest -PtestBuildType=debug
+          cp MapLibreAndroidTestApp/build/outputs/apk/vulkan/debug/MapLibreAndroidTestApp-vulkan-debug.apk InstrumentationTestAppVulkan.apk
+          cp MapLibreAndroidTestApp/build/outputs/apk/androidTest/vulkan/debug/MapLibreAndroidTestApp-vulkan-debug-androidTest.apk InstrumentationTestsVulkan.apk
+
+      - name: Upload android-ui-test-vulkan
+        uses: actions/upload-artifact@v4
+        with:
+          if-no-files-found: error
+          name: android-ui-test-vulkan
+          path: |
+            platform/android/InstrumentationTestAppVulkan.apk
+            platform/android/InstrumentationTestsVulkan.apk
 
   android-build-cpp-test:
     runs-on: ubuntu-24.04
diff --git a/.github/workflows/android-device-test.yml b/.github/workflows/android-device-test.yml
index b5802e062..c28e590aa 100644
--- a/.github/workflows/android-device-test.yml
+++ b/.github/workflows/android-device-test.yml
@@ -49,10 +49,19 @@ jobs:
             testSpecArn: "arn:aws:devicefarm:us-west-2:373521797162:upload:20687d72-0e46-403e-8f03-0941850665bc/14862afb-cf88-44aa-9f1e-5131cbb22f01"
           },
           {
-            artifactName: android-ui-test,
-            testFile: InstrumentationTests.apk,
-            appFile: InstrumentationTestApp.apk,
-            name: "Android Instrumentation Tests",
+            artifactName: android-ui-test-opengl,
+            testFile: InstrumentationTestsOpenGL.apk,
+            appFile: InstrumentationTestAppOpenGL.apk,
+            name: "Android Instrumentation Tests (OpenGL)",
+            # Google Pixel 7 Pro
+            devicePool: "arn:aws:devicefarm:us-west-2:373521797162:devicepool:20687d72-0e46-403e-8f03-0941850665bc/9692fe7f-86a9-4ecc-908f-175600968564",
+            testSpecArn: "arn:aws:devicefarm:us-west-2:373521797162:upload:20687d72-0e46-403e-8f03-0941850665bc/09e0738e-c91e-4c5f-81e6-06a06cc340d8"
+          },
+          {
+            artifactName: android-ui-test-vulkan,
+            testFile: InstrumentationTestsVulkan.apk,
+            appFile: InstrumentationTestAppVulkan.apk,
+            name: "Android Instrumentation Tests (Vulkan)",
             # Google Pixel 7 Pro
             devicePool: "arn:aws:devicefarm:us-west-2:373521797162:devicepool:20687d72-0e46-403e-8f03-0941850665bc/9692fe7f-86a9-4ecc-908f-175600968564",
             testSpecArn: "arn:aws:devicefarm:us-west-2:373521797162:upload:20687d72-0e46-403e-8f03-0941850665bc/09e0738e-c91e-4c5f-81e6-06a06cc340d8"