diff --git a/compiler/testData/cli/jvm/androidPlugin/android/widget/TextView.java b/compiler/testData/cli/jvm/androidPlugin/android/widget/TextView.java
new file mode 100644
index 00000000000..835b3494207
--- /dev/null
+++ b/compiler/testData/cli/jvm/androidPlugin/android/widget/TextView.java
@@ -0,0 +1,5 @@
+package android.widget;
+
+public class TextView extends android.view.View {
+    public void setText(String text) {}
+}
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/androidPlugin/androidWidget.kt b/compiler/testData/cli/jvm/androidPlugin/androidWidget.kt
deleted file mode 100644
index dfc94ac20a1..00000000000
--- a/compiler/testData/cli/jvm/androidPlugin/androidWidget.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package android.widget
-
-public open class TextView : android.view.View() {
-    public fun setText(@Suppress("UNUSED_PARAMETER") text: String) {}
-}
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/androidPlugin/fakeAppwidgetPackage.kt b/compiler/testData/cli/jvm/androidPlugin/fakeAppwidgetPackage.kt
deleted file mode 100644
index b150584134e..00000000000
--- a/compiler/testData/cli/jvm/androidPlugin/fakeAppwidgetPackage.kt
+++ /dev/null
@@ -1 +0,0 @@
-package android.appwidget
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/androidPlugin/fakeInputMethodServicePackage.kt b/compiler/testData/cli/jvm/androidPlugin/fakeInputMethodServicePackage.kt
deleted file mode 100644
index 74b092db14e..00000000000
--- a/compiler/testData/cli/jvm/androidPlugin/fakeInputMethodServicePackage.kt
+++ /dev/null
@@ -1 +0,0 @@
-package android.inputmethodservice
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/androidPlugin/fakeOpenglPackage.kt b/compiler/testData/cli/jvm/androidPlugin/fakeOpenglPackage.kt
deleted file mode 100644
index 2f38c0654d1..00000000000
--- a/compiler/testData/cli/jvm/androidPlugin/fakeOpenglPackage.kt
+++ /dev/null
@@ -1 +0,0 @@
-package android.opengl
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/androidPlugin/fakeWebkitPackage.kt b/compiler/testData/cli/jvm/androidPlugin/fakeWebkitPackage.kt
deleted file mode 100644
index c25921a9b0e..00000000000
--- a/compiler/testData/cli/jvm/androidPlugin/fakeWebkitPackage.kt
+++ /dev/null
@@ -1 +0,0 @@
-package android.webkit
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/pluginSimple.args b/compiler/testData/cli/jvm/pluginSimple.args
index 50106455337..82240c9cd8b 100644
--- a/compiler/testData/cli/jvm/pluginSimple.args
+++ b/compiler/testData/cli/jvm/pluginSimple.args
@@ -7,10 +7,4 @@ plugin\:org.jetbrains.kotlin.android\:androidManifest=$TESTDATA_DIR$/androidPlug
 -P
 plugin\:org.jetbrains.kotlin.android\:androidRes=$TESTDATA_DIR$/androidPlugin/res
 $TESTDATA_DIR$/pluginSimple.kt
-$TESTDATA_DIR$/androidPlugin/androidApp.kt
-$TESTDATA_DIR$/androidPlugin/androidView.kt
-$TESTDATA_DIR$/androidPlugin/androidWidget.kt
-$TESTDATA_DIR$/androidPlugin/fakeAppwidgetPackage.kt
-$TESTDATA_DIR$/androidPlugin/fakeInputMethodServicePackage.kt
-$TESTDATA_DIR$/androidPlugin/fakeOpenglPackage.kt
-$TESTDATA_DIR$/androidPlugin/fakeWebkitPackage.kt
\ No newline at end of file
+$TESTDATA_DIR$/androidPlugin
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/pluginSimpleUsage.out b/compiler/testData/cli/jvm/pluginSimpleUsage.out
index a8faeee7a70..23f2b3bd07c 100644
--- a/compiler/testData/cli/jvm/pluginSimpleUsage.out
+++ b/compiler/testData/cli/jvm/pluginSimpleUsage.out
@@ -3,6 +3,5 @@ error: required plugin option not present: org.jetbrains.kotlin.android:androidR
 Plugin "org.jetbrains.kotlin.android" usage:
   androidRes <path>          Android resources path (required, multiple)
   androidManifest <path>     Android manifest file (required)
-  supportV4 <path>           Support android-v4 library
 
 COMPILATION_ERROR