diff --git a/compiler/testData/cli/jvm/importsProducer.args b/compiler/testData/cli/jvm/importsProducer.args
deleted file mode 100644
index edea8c07f59..00000000000
--- a/compiler/testData/cli/jvm/importsProducer.args
+++ /dev/null
@@ -1,4 +0,0 @@
-$TESTDATA_DIR$/importsProducer
--d
-$TEMP_DIR$
--Xoutput-imports=$TESTDATA_DIR$/importsProducerDump.txt
diff --git a/compiler/testData/cli/jvm/importsProducerDump.txt b/compiler/testData/cli/jvm/importsProducerDump.txt
deleted file mode 100644
index 41f02db5480..00000000000
--- a/compiler/testData/cli/jvm/importsProducerDump.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"\/home\/dsavvinov\/Repos\/kotlin\/compiler\/testData\/cli\/jvm\/importsProducer\/a\/A1.kt":["import c.JavaC"],"\/home\/dsavvinov\/Repos\/kotlin\/compiler\/testData\/cli\/jvm\/importsProducer\/a\/A2.kt":[],"\/home\/dsavvinov\/Repos\/kotlin\/compiler\/testData\/cli\/jvm\/importsProducer\/b\/B1.kt":["import a.*"],"\/home\/dsavvinov\/Repos\/kotlin\/compiler\/testData\/cli\/jvm\/importsProducer\/b\/nestedB\/B2.kt":["import a.A1 as AliasedA1","import a.A1"],"\/home\/dsavvinov\/Repos\/kotlin\/compiler\/testData\/cli\/jvm\/importsProducer\/c\/C1.kt":["import a.A1","import a.A2","import b.B1.Companion.a2","import b.nestedB.bar","import b.nestedB.foo"]}
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/importsProducer/a/A1.kt b/compiler/testData/importsProducer/simpleCase/a/A1.kt
similarity index 100%
rename from compiler/testData/cli/jvm/importsProducer/a/A1.kt
rename to compiler/testData/importsProducer/simpleCase/a/A1.kt
diff --git a/compiler/testData/cli/jvm/importsProducer/a/A2.kt b/compiler/testData/importsProducer/simpleCase/a/A2.kt
similarity index 100%
rename from compiler/testData/cli/jvm/importsProducer/a/A2.kt
rename to compiler/testData/importsProducer/simpleCase/a/A2.kt
diff --git a/compiler/testData/cli/jvm/importsProducer/b/B1.kt b/compiler/testData/importsProducer/simpleCase/b/B1.kt
similarity index 100%
rename from compiler/testData/cli/jvm/importsProducer/b/B1.kt
rename to compiler/testData/importsProducer/simpleCase/b/B1.kt
diff --git a/compiler/testData/cli/jvm/importsProducer/b/nestedB/B2.kt b/compiler/testData/importsProducer/simpleCase/b/nestedB/B2.kt
similarity index 100%
rename from compiler/testData/cli/jvm/importsProducer/b/nestedB/B2.kt
rename to compiler/testData/importsProducer/simpleCase/b/nestedB/B2.kt
diff --git a/compiler/testData/cli/jvm/importsProducer/c/C1.kt b/compiler/testData/importsProducer/simpleCase/c/C1.kt
similarity index 100%
rename from compiler/testData/cli/jvm/importsProducer/c/C1.kt
rename to compiler/testData/importsProducer/simpleCase/c/C1.kt
diff --git a/compiler/testData/cli/jvm/importsProducer/c/JavaC.java b/compiler/testData/importsProducer/simpleCase/c/JavaC.java
similarity index 100%
rename from compiler/testData/cli/jvm/importsProducer/c/JavaC.java
rename to compiler/testData/importsProducer/simpleCase/c/JavaC.java
diff --git a/compiler/testData/importsProducer/simpleCase/simpleCase.dump b/compiler/testData/importsProducer/simpleCase/simpleCase.dump
new file mode 100644
index 00000000000..6abc4556e4c
--- /dev/null
+++ b/compiler/testData/importsProducer/simpleCase/simpleCase.dump
@@ -0,0 +1 @@
+{"$TESTDATA_DIR$\/a\/A1.kt":["import c.JavaC"],"$TESTDATA_DIR$\/a\/A2.kt":[],"$TESTDATA_DIR$\/b\/B1.kt":["import a.*"],"$TESTDATA_DIR$\/b\/nestedB\/B2.kt":["import a.A1 as AliasedA1","import a.A1"],"$TESTDATA_DIR$\/c\/C1.kt":["import a.A1","import a.A2","import b.B1.Companion.a2","import b.nestedB.bar","import b.nestedB.foo"]}
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/importsProducer.out b/compiler/testData/importsProducer/simpleCase/simpleCase.out
similarity index 100%
rename from compiler/testData/cli/jvm/importsProducer.out
rename to compiler/testData/importsProducer/simpleCase/simpleCase.out
diff --git a/compiler/tests/org/jetbrains/kotlin/cli/CliTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cli/CliTestGenerated.java
index ca8f054c10d..d16491f4177 100644
--- a/compiler/tests/org/jetbrains/kotlin/cli/CliTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/cli/CliTestGenerated.java
@@ -236,11 +236,6 @@ public class CliTestGenerated extends AbstractCliTest {
             runTest("compiler/testData/cli/jvm/help.args");
         }
 
-        @TestMetadata("importsProducer.args")
-        public void testImportsProducer() throws Exception {
-            runTest("compiler/testData/cli/jvm/importsProducer.args");
-        }
-
         @TestMetadata("inlineCycle.args")
         public void testInlineCycle() throws Exception {
             runTest("compiler/testData/cli/jvm/inlineCycle.args");
diff --git a/compiler/tests/org/jetbrains/kotlin/cli/ImportsProducerTest.kt b/compiler/tests/org/jetbrains/kotlin/cli/ImportsProducerTest.kt
new file mode 100644
index 00000000000..5375051588e
--- /dev/null
+++ b/compiler/tests/org/jetbrains/kotlin/cli/ImportsProducerTest.kt
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.cli
+
+import com.intellij.openapi.util.io.FileUtil
+import com.intellij.testFramework.TestDataPath
+import junit.framework.TestCase
+import org.jetbrains.kotlin.cli.AbstractCliTest.*
+import org.jetbrains.kotlin.cli.common.ExitCode
+import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
+import org.jetbrains.kotlin.test.KotlinTestUtils
+import org.jetbrains.kotlin.test.TestCaseWithTmpdir
+import org.jetbrains.kotlin.test.TestMetadata
+import java.io.File
+
+@TestMetadata("compiler/testData/importsProducer")
+@TestDataPath("\$PROJECT_ROOT")
+class ImportsProducerTest : TestCaseWithTmpdir() {
+
+    @TestMetadata("simpleCase/importsProducer.args")
+    fun testImportsProducer() {
+        doTest("compiler/testData/importsProducer/simpleCase")
+    }
+
+    fun doTest(testDataDirPath: String) {
+        System.setProperty("java.awt.headless", "true")
+        val testDataDir = File(testDataDirPath)
+        val expectedDumpFile = testDataDir.resolve(testDataDir.name + ".dump")
+        val expectedOutputFile = testDataDir.resolve(testDataDir.name + ".out")
+        val actualDumpFile = tmpdir.resolve(testDataDir.name + ".dump")
+
+        // Check CLI-output of compiler
+        val actualOutput = invokeImportsProducerAndGrabOutput(testDataDir, tmpdir, actualDumpFile)
+        KotlinTestUtils.assertEqualsToFile(expectedOutputFile, actualOutput)
+
+        // Check imports dump
+        // Note that imports dumper outputs absolute paths to files, which is inconvenient for tests,
+        // so we have to relativize them
+        val actualRelativizedDump = FileUtil.loadFile(actualDumpFile, Charsets.UTF_8.name(), /* convertLineSeparators = */ true)
+            .relativizeAbsolutePaths(testDataDir)
+
+        KotlinTestUtils.assertEqualsToFile(expectedDumpFile, actualRelativizedDump)
+    }
+
+    private fun invokeImportsProducerAndGrabOutput(testDataDir: File, tmpDir: File, actualDumpFile: File): String {
+        val compiler = K2JVMCompiler()
+        val (output, exitCode) = executeCompilerGrabOutput(
+            compiler,
+            listOf(
+                testDataDir.absolutePath,
+                DESTINATION_COMPILER_ARGUMENT,
+                tmpDir.path,
+                OUTPUT_IMPORTS_COMPILER_ARGUMENT + "=" + actualDumpFile.path
+            )
+        )
+
+//        TestCase.assertEquals("Imports dumper should return ExitCode.OK", ExitCode.OK, exitCode)
+
+        return getNormalizedCompilerOutput(output, exitCode, testDataDir.path)
+    }
+
+    companion object {
+        const val DESTINATION_COMPILER_ARGUMENT = "-d"
+        const val OUTPUT_IMPORTS_COMPILER_ARGUMENT = "-Xoutput-imports"
+    }
+}
+
+private fun String.relativizeAbsolutePaths(relativeTo: File): String {
+    // JSON escapes slashes
+    val pattern = relativeTo.absoluteFile.toString().replace("/", "\\/")
+    return this.replace(pattern, "\$TESTDATA_DIR$")
+}