diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
index a550111..c4d04d3 100644
--- a/lib/build.gradle.kts
+++ b/lib/build.gradle.kts
@@ -52,8 +52,9 @@ android {
             localDevices {
                 create("virtual") {
                     device = "Pixel 3"
-                    apiLevel = 35
+                    apiLevel = 33
                     systemImageSource = "aosp-atd"
+                    testedAbi = "x86_64"
                 }
             }
         }
diff --git a/sample-app/build.gradle.kts b/sample-app/build.gradle.kts
index be176b4..e645402 100644
--- a/sample-app/build.gradle.kts
+++ b/sample-app/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 
 android {
     namespace = "at.bitfire.cert4android.demo"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "at.bitfire.cert4android.demo"
@@ -14,7 +14,7 @@ android {
         versionName = "1.0.0"
 
         minSdk = 21
-        targetSdk = 35
+        targetSdk = 36
 
         vectorDrawables {
             useSupportLibrary = true