diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index 08469f47e..c5659649b 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -155,6 +155,50 @@ jobs:
             platform/android/InstrumentationTestApp.apk
             platform/android/InstrumentationTests.apk
 
+  android-build-cpp-test:
+    runs-on: ubuntu-24.04
+    needs:
+      - pre_job
+    if: needs.pre_job.outputs.should_skip != 'true'
+    defaults:
+      run:
+        working-directory: test/android
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+        fetch-depth: 0
+
+    - uses: actions/setup-java@v4
+      with:
+        distribution: "temurin"
+        java-version: "17"
+
+    - name: Get CMake and Ninja
+      uses: lukka/get-cmake@latest
+      with:
+        cmakeVersion: 3.24.1
+        ninjaVersion: latest
+
+    - uses: hendrikmuhs/ccache-action@v1.2
+      with:
+        key: ${{ github.job }}
+
+    - name: Build C++ Unit Tests App
+      run: |
+        ./gradlew assembleDebug assembleAndroidTest
+        cp app/build/outputs/apk/debug/app-debug.apk CppUnitTestsApp.apk
+        cp app/build/outputs/apk/androidTest/release/app-release-androidTest.apk CppUnitTests.apk
+
+    - name: Store C++ Unit Tests .apk files
+      uses: actions/upload-artifact@v4
+      with:
+        name: android-cpp-tests
+        if-no-files-found: error
+        path: |
+          ./test/android/CppUnitTestsApp.apk
+          ./test/android/CppUnitTests.apk
+
   android-build-render-test:
     runs-on: ubuntu-latest
     needs:
diff --git a/.github/workflows/android-device-test.yml b/.github/workflows/android-device-test.yml
index 06fce2457..af4dc1713 100644
--- a/.github/workflows/android-device-test.yml
+++ b/.github/workflows/android-device-test.yml
@@ -43,6 +43,15 @@ jobs:
             # 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-cpp-tests,
+            testFile: CppUnitTests.apk,
+            appFile: CppUnitTestsApp.apk,
+            name: "Android C++ Unit Tests",
+            # 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"
           }
         ]
     runs-on: ubuntu-latest