diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 5bac020ebd..c1fccec471 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -91,6 +91,15 @@ android {
                     // To include Google services, use "google". Else "aosp"
                     systemImageSource = "google"
                 }
+                // Run test with ./gradlew pixel2api30GplayDebugAndroidTest
+                pixel2api30(ManagedVirtualDevice) {
+                    // Use device profiles you typically see in Android Studio.
+                    device = "Pixel 2"
+                    // Use only API levels 27 and higher.
+                    apiLevel = 30
+                    // To include Google services, use "google". Else "aosp"
+                    systemImageSource = "google"
+                }
                 // Ref: https://developer.android.com/studio/test/gradle-managed-devices#gmd-atd
                 // Run test with ./gradlew pixel2api30AtdGplayDebugAndroidTest
                 // Warning: Screenshot tests that depend on hardware rendering currently aren't supported when using ATDs.
diff --git a/tools/gradle/coverage.gradle b/tools/gradle/coverage.gradle
index 7f1eeab5d1..b4f251dd77 100644
--- a/tools/gradle/coverage.gradle
+++ b/tools/gradle/coverage.gradle
@@ -87,5 +87,6 @@ task unitTestsWithCoverage(type: GradleBuild) {
 task instrumentationTestsWithCoverage(type: GradleBuild) {
     startParameter.projectProperties.coverage = [enableTestCoverage: true]
     startParameter.projectProperties['android.testInstrumentationRunnerArguments.notPackage'] = 'im.vector.app.ui'
-    tasks = [':vector-app:pixel2api30AtdGplayDebugAndroidTest', ':vector:pixel2api30AtdDebugAndroidTest', 'matrix-sdk-android:pixel2api30AtdDebugAndroidTest']
+    // tasks = [':vector-app:pixel2api30AtdGplayDebugAndroidTest', ':vector:pixel2api30AtdDebugAndroidTest', 'matrix-sdk-android:pixel2api30AtdDebugAndroidTest']
+    tasks = [':vector-app:pixel2api30GplayDebugAndroidTest', ':vector:pixel2api30DebugAndroidTest', 'matrix-sdk-android:pixel2api30DebugAndroidTest']
 }
diff --git a/vector-app/build.gradle b/vector-app/build.gradle
index 998aa037f5..fe651adddc 100644
--- a/vector-app/build.gradle
+++ b/vector-app/build.gradle
@@ -225,6 +225,15 @@ android {
                     // To include Google services, use "google". Else "aosp"
                     systemImageSource = "google"
                 }
+                // Run test with ./gradlew pixel2api30GplayDebugAndroidTest
+                pixel2api30(ManagedVirtualDevice) {
+                    // Use device profiles you typically see in Android Studio.
+                    device = "Pixel 2"
+                    // Use only API levels 27 and higher.
+                    apiLevel = 30
+                    // To include Google services, use "google". Else "aosp"
+                    systemImageSource = "google"
+                }
                 // Ref: https://developer.android.com/studio/test/gradle-managed-devices#gmd-atd
                 // Run test with ./gradlew pixel2api30AtdGplayDebugAndroidTest
                 // Warning: Screenshot tests that depend on hardware rendering currently aren't supported when using ATDs.
diff --git a/vector/build.gradle b/vector/build.gradle
index b1ccd41ce2..ea41cbe79d 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -80,6 +80,15 @@ android {
                     // To include Google services, use "google". Else "aosp"
                     systemImageSource = "google"
                 }
+                // Run test with ./gradlew pixel2api30GplayDebugAndroidTest
+                pixel2api30(ManagedVirtualDevice) {
+                    // Use device profiles you typically see in Android Studio.
+                    device = "Pixel 2"
+                    // Use only API levels 27 and higher.
+                    apiLevel = 30
+                    // To include Google services, use "google". Else "aosp"
+                    systemImageSource = "google"
+                }
                 // Ref: https://developer.android.com/studio/test/gradle-managed-devices#gmd-atd
                 // Run test with ./gradlew pixel2api30AtdGplayDebugAndroidTest
                 // Warning: Screenshot tests that depend on hardware rendering currently aren't supported when using ATDs.