diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationTestOptionsConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationTestOptionsConventionPlugin.kt
index 51e1d1a89..6f17e6ddb 100644
--- a/build-logic/convention/src/main/kotlin/AndroidApplicationTestOptionsConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidApplicationTestOptionsConventionPlugin.kt
@@ -23,10 +23,9 @@ import org.gradle.kotlin.dsl.getByType
 class AndroidApplicationTestOptionsConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
-            pluginManager.apply("com.android.application")
-
-            val extension = extensions.getByType<ApplicationExtension>()
-            configureTestOptions(extension)
+            extensions.configure<ApplicationExtension> {
+                configureTestOptions(this)
+            }
         }
     }
 }
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryTestOptionsConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryTestOptionsConventionPlugin.kt
index 2aba116a1..ac2bedab4 100644
--- a/build-logic/convention/src/main/kotlin/AndroidLibraryTestOptionsConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryTestOptionsConventionPlugin.kt
@@ -24,10 +24,9 @@ import org.gradle.kotlin.dsl.getByType
 class AndroidLibraryTestOptionsConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
-            pluginManager.apply("com.android.library")
-
-            val extension = extensions.getByType<LibraryExtension>()
-            configureTestOptions(extension)
+            extensions.configure<LibraryExtension> {
+                configureTestOptions(this)
+            }
         }
     }
 }