diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml
index b8a0ddb83ae..9b7cd0162a4 100644
--- a/.gitlab-ci/container/gitlab-ci.yml
+++ b/.gitlab-ci/container/gitlab-ci.yml
@@ -222,7 +222,10 @@ debian/s390x_build:
     ANDROID_NDK_VERSION: "r27c"
     ANDROID_SDK_VERSION: 34
     # Space-separated list of interesting CTS modules
-    ANDROID_CTS_MODULES: CtsGraphicsTestCases
+    ANDROID_CTS_MODULES: >-
+      CtsGraphicsTestCases
+      CtsNativeHardwareTestCases
+      CtsSkQPTestCases
     ANDROID_LLVM_VERSION: llvmorg-19.1.7
     ANDROID_LLVM_ARTIFACT_NAME: android-x86_64-llvm-20250324
     # This can be confusing: LLVM_VERSION refers to the host LLVM toolchain
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 4bec97afc2a..91e045580c1 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -23,7 +23,7 @@ variables:
 
   DEBIAN_BUILD_TAG: "20250324-android"
 
-  DEBIAN_TEST_ANDROID_TAG: "20250416-pigtag"
+  DEBIAN_TEST_ANDROID_TAG: "20250417-aosp-cts"
   DEBIAN_TEST_GL_TAG: "20250416-pigtag"
   DEBIAN_TEST_VK_TAG: "20250416-pigtag"
   KERNEL_ROOTFS_TAG: "20250416-pigtag"
diff --git a/src/gallium/frontends/lavapipe/ci/lvp-android-angle-android-cts-include.txt b/src/gallium/frontends/lavapipe/ci/lvp-android-angle-android-cts-include.txt
new file mode 100644
index 00000000000..511845a71ce
--- /dev/null
+++ b/src/gallium/frontends/lavapipe/ci/lvp-android-angle-android-cts-include.txt
@@ -0,0 +1,10 @@
+x86_64 CtsGraphicsTestCases
+x86_64 CtsNativeHardwareTestCases
+x86_64 CtsSkQPTestCases
+
+# When adding more entries like the ones below, uncommented, remember to add
+# the respective modules (e.g. CtsDeqpTestCases) to ANDROID_CTS_MODULES in
+# .gitlab-ci/container/gitlab-ci.yml::.android-variables
+
+#x86_64 CtsDeqpTestCases dEQP-VK.wsi.android.*
+#x86_64 CtsDeqpTestCases dEQP-VK.api.external.memory.android_hardware_buffer.*
diff --git a/src/gallium/frontends/lavapipe/ci/lvp-android-angle-android-cts-skips.txt b/src/gallium/frontends/lavapipe/ci/lvp-android-angle-android-cts-skips.txt
index 9202b8e987d..5f669d02ac0 100644
--- a/src/gallium/frontends/lavapipe/ci/lvp-android-angle-android-cts-skips.txt
+++ b/src/gallium/frontends/lavapipe/ci/lvp-android-angle-android-cts-skips.txt
@@ -27,6 +27,10 @@ x86_64 CtsGraphicsTestCases android.graphics.drawable.cts.AnimatedVectorDrawable
 x86_64 CtsGraphicsTestCases android.graphics.drawable.cts.AnimationDrawableTest
 x86_64 CtsGraphicsTestCases android.graphics.drawable.cts.IconTest
 
+x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#Blob_BlobTest_GpuDataBufferCpuRead_BLOB
+x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#Blob_BlobTest_GpuDataBufferCpuWrite_BLOB
+x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#Blob_BlobTest_GpuDataBufferVertexBuffer_BLOB
+
 # Failures
 x86_64 CtsGraphicsTestCases android.graphics.cts.BitmapTest#testHardwareBitmapNotLeaking
 x86_64 CtsGraphicsTestCases android.graphics.cts.VulkanFeaturesTest#testVulkanRequiredExtensions
@@ -38,3 +42,19 @@ x86_64 CtsGraphicsTestCases android.graphics.cts.VulkanFeaturesTest#testAndroidB
 x86_64 CtsGraphicsTestCases android.graphics.cts.VulkanFeaturesTest#testVulkanVersionForVrHighPerformance
 x86_64 CtsGraphicsTestCases android.graphics.cts.VulkanFeaturesTest#testVulkanBlockedExtensions
 x86_64 CtsGraphicsTestCases android.graphics.cts.VulkanFeaturesTest#testVulkan1_1Requirements
+
+x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_CpuWriteColorGpuRead_R10G10B10A2_UNORM
+x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_CpuWriteColorGpuRead_R16G16B16A16_FLOAT
+x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_CpuWriteColorGpuRead_R5G6B5_UNORM
+x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_CpuWriteColorGpuRead_R8G8B8A8_UNORM
+x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_CpuWriteColorGpuRead_R8G8B8A8_UNORM_sRGB
+x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_CpuWriteColorGpuRead_R8G8B8X8_UNORM
+x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_CpuWriteColorGpuRead_R8G8B8X8_UNORM_sRGB
+x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_GpuColorOutputCpuRead_R5G6B5_UNORM
+x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_GpuColorOutputCpuRead_R8G8B8A8_UNORM
+x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_GpuColorOutputCpuRead_R8G8B8A8_UNORM_sRGB
+x86_64 CtsNativeHardwareTestCases android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_GpuColorOutputCpuRead_R8G8B8X8_UNORM
+
+x86_64 CtsSkQPTestCases org.skia.skqp.SkQPRunner#UnitTest_ES2BlendWithNoTexture
+x86_64 CtsSkQPTestCases org.skia.skqp.SkQPRunner#UnitTest_GrAHardwareBuffer_BasicDrawTest
+x86_64 CtsSkQPTestCases org.skia.skqp.SkQPRunner#UnitTest_VkYCbcrSampler_DrawImageWithYcbcrSampler