diff --git a/libraries/tools/gradle/android-test-fixes/build.gradle.kts b/libraries/tools/gradle/android-test-fixes/build.gradle.kts
index d7e06363710..cab0d505bd3 100644
--- a/libraries/tools/gradle/android-test-fixes/build.gradle.kts
+++ b/libraries/tools/gradle/android-test-fixes/build.gradle.kts
@@ -9,11 +9,11 @@ repositories {
 }
 
 dependencies {
-    compileOnly(gradleKotlinDsl())
-    compileOnly("com.android.tools.build:gradle:3.4.0")
-    compileOnly("com.android.tools.build:gradle-api:3.4.0")
-    compileOnly("com.android.tools.build:builder:3.4.0")
-    compileOnly("com.android.tools.build:builder-model:3.4.0")
+    commonCompileOnly(gradleKotlinDsl())
+    commonCompileOnly("com.android.tools.build:gradle:3.4.0")
+    commonCompileOnly("com.android.tools.build:gradle-api:3.4.0")
+    commonCompileOnly("com.android.tools.build:builder:3.4.0")
+    commonCompileOnly("com.android.tools.build:builder-model:3.4.0")
 }
 
 gradlePlugin {
diff --git a/libraries/tools/gradle/android-test-fixes/src/main/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/AndroidTestFixesPlugin.kt b/libraries/tools/gradle/android-test-fixes/src/common/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/AndroidTestFixesPlugin.kt
similarity index 100%
rename from libraries/tools/gradle/android-test-fixes/src/main/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/AndroidTestFixesPlugin.kt
rename to libraries/tools/gradle/android-test-fixes/src/common/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/AndroidTestFixesPlugin.kt
diff --git a/libraries/tools/gradle/android-test-fixes/src/main/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/TestFixesProperties.kt b/libraries/tools/gradle/android-test-fixes/src/common/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/TestFixesProperties.kt
similarity index 100%
rename from libraries/tools/gradle/android-test-fixes/src/main/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/TestFixesProperties.kt
rename to libraries/tools/gradle/android-test-fixes/src/common/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/TestFixesProperties.kt
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/common/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/fixes/debugKeystoreFix.kt
similarity index 100%
rename from libraries/tools/gradle/android-test-fixes/src/main/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/fixes/debugKeystoreFix.kt
rename to libraries/tools/gradle/android-test-fixes/src/common/kotlin/org/jetbrains/kotlin/gradle/test/fixes/android/fixes/debugKeystoreFix.kt