diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c243713..c1ed672 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -19,37 +19,40 @@ jobs:
     steps:
       - name: Check out repo
         uses: actions/checkout@v4
-        with:
-          submodules: recursive
-      - name: Enable KVM
+      #- name: Enable KVM
+      #  run: |
+      #    echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+      #    sudo udevadm control --reload-rules
+      #    sudo udevadm trigger --name-match=kvm
+      #- name: AVD cache
+      #  uses: actions/cache@v4
+      #  id: avd-cache
+      #  with:
+      #    path: |
+      #      ~/.android/avd/*
+      #      ~/.android/adb*
+      #    key: avd-${{ matrix.api }}
+      #    save-always: true
+      #- name: Create AVD and generate snapshot for caching
+      #  if: steps.avd-cache.outputs.cache-hit != 'true'
+      #  uses: reactivecircus/android-emulator-runner@v2
+      #  with:
+      #    api-level: ${{ matrix.api }}
+      #    arch: ${{ matrix.arch }}
+      #    force-avd-creation: false
+      #    emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+      #    disable-animations: false
+      #    script: echo "Generated AVD snapshot for caching."
+      #- name: Run tests in emulator
+      #  uses: reactivecircus/android-emulator-runner@v2
+      #  with:
+      #    api-level: ${{ matrix.api }}
+      #    arch: ${{ matrix.arch }}
+      #    force-avd-creation: false
+      #    emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+      #    disable-animations: true
+      #    script: /bin/true
+      - name: Run tests
         run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-      - name: AVD cache
-        uses: actions/cache@v4
-        id: avd-cache
-        with:
-          path: |
-            ~/.android/avd/*
-            ~/.android/adb*
-          key: avd-${{ matrix.api }}
-      - name: Create AVD and generate snapshot for caching
-        if: steps.avd-cache.outputs.cache-hit != 'true'
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ matrix.api }}
-          arch: ${{ matrix.arch }}
-          force-avd-creation: false
-          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: false
-          script: echo "Generated AVD snapshot for caching."
-      - name: Run tests in emulator
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ matrix.api }}
-          arch: ${{ matrix.arch }}
-          force-avd-creation: false
-          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: true
-          script: make check
+          env
+          make check ANDROID_ARCH=${{ matrix.arch }} ANDROID_ABI=${{ matrix.arch }} ANDROID_API_LEVEL=${{ matrix.api }}