diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/src/test/kotlin/internalTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/src/test/kotlin/internalTest.kt
new file mode 100644
index 00000000000..d96cae3bfd7
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/AndroidProject/Lib/src/test/kotlin/internalTest.kt
@@ -0,0 +1,6 @@
+import lib.internalLibFun
+
+fun main(args: Array<String>) {
+    // check that unit tests can access internals of the main variant:
+    internalLibFun()
+}
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LegacyAndroidAndroidProjectHandler.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LegacyAndroidAndroidProjectHandler.kt
index 2632afb12e8..a045b7b5d6e 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LegacyAndroidAndroidProjectHandler.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LegacyAndroidAndroidProjectHandler.kt
@@ -61,9 +61,9 @@ internal class LegacyAndroidAndroidProjectHandler(kotlinConfigurationTools: Kotl
         createSyncOutputTask(project, kotlinTask, javaTask, kotlinAfterJavaTask, getVariantName(variantData))
 
         // In lib modules, the androidTest variants get the classes jar in their classpath instead of the Java
-        // destination dir. To use it as a friend path, set the jar as the javaOutputDir (see its usages):
+        // destination dir. Attach the JAR to be consumed as friend path:
         if (variantData is LibraryVariantData) {
-            variantData.dependencyJarOrNull?.let { kotlinTask.javaOutputDir = it }
+            variantData.dependencyJarOrNull?.let { jar -> kotlinTask.attachClassesDir { jar } }
         }
     }