diff --git a/libraries/tools/gradle/android-test-fixes/src/main/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/fixes/debugKeystoreFix.kt b/libraries/tools/gradle/android-test-fixes/src/main/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/fixes/debugKeystoreFix.kt
index 7bdf7591b44..7e2cfc0749d 100644
--- a/libraries/tools/gradle/android-test-fixes/src/main/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/fixes/debugKeystoreFix.kt
+++ b/libraries/tools/gradle/android-test-fixes/src/main/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/fixes/debugKeystoreFix.kt
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.gradle.test.fixes.android.fixes
 
 import com.android.build.gradle.AppExtension
 import com.android.build.gradle.BaseExtension
+import com.android.build.gradle.FeatureExtension
 import com.android.build.gradle.TestExtension
 import org.gradle.api.Action
 import org.gradle.api.Plugin
@@ -26,6 +27,8 @@ internal fun Project.applyDebugKeystoreFix(
 ) {
     plugins.withId("com.android.application", fix<AppExtension>(testFixesProperties))
     plugins.withId("com.android.test", fix<TestExtension>(testFixesProperties))
+    plugins.withId("com.android.feature", fix<FeatureExtension>(testFixesProperties))
+    plugins.withId("com.android.test", fix<TestExtension>(testFixesProperties))
 }
 
 private inline fun <reified AndroidExtension : BaseExtension> Project.fix(