diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 04918061a..81c128b91 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import com.google.samples.apps.nowinandroid.NiaBuildType
-import com.android.build.api.dsl.ManagedVirtualDevice
 
 plugins {
     id("nowinandroid.android.application")
@@ -75,17 +74,6 @@ android {
         unitTests {
             isIncludeAndroidResources = true
         }
-        // TODO: Convert it as a convention plugin once Flamingo goes out (https://github.com/android/nowinandroid/issues/523)
-        managedDevices {
-            devices {
-                maybeCreate<ManagedVirtualDevice>("pixel4api30").apply {
-                    device = "Pixel 4"
-                    apiLevel = 30
-                    // ATDs currently support only API level 30.
-                    systemImageSource = "aosp-atd"
-                }
-            }
-        }
     }
     namespace = "com.google.samples.apps.nowinandroid"
 }
diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
index 79f980b6c..10eb4363c 100644
--- a/core/database/build.gradle.kts
+++ b/core/database/build.gradle.kts
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import com.android.build.api.dsl.ManagedVirtualDevice
-
 // TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
@@ -31,20 +29,6 @@ android {
             "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"
     }
     namespace = "com.google.samples.apps.nowinandroid.core.database"
-
-    testOptions {
-        // TODO: Convert it as a convention plugin once Flamingo goes out (https://github.com/android/nowinandroid/issues/523)
-        managedDevices {
-            devices {
-                maybeCreate<ManagedVirtualDevice>("pixel4api30").apply {
-                    device = "Pixel 4"
-                    apiLevel = 30
-                    // ATDs currently support only API level 30.
-                    systemImageSource = "aosp-atd"
-                }
-            }
-        }
-    }
 }
 
 dependencies {
@@ -54,4 +38,4 @@ dependencies {
     implementation(libs.kotlinx.datetime)
 
     androidTestImplementation(project(":core:testing"))
-}
\ No newline at end of file
+}