diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java
index 70197816a83..1dfc85f9b2f 100644
--- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java
+++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java
@@ -19,6 +19,7 @@ package org.jetbrains.jet.jps.build;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.testFramework.LightVirtualFile;
+import com.intellij.util.Processor;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.io.ZipUtil;
 import kotlin.KotlinPackage;
@@ -29,6 +30,7 @@ import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.utils.PathUtil;
 import org.jetbrains.jps.builders.BuildResult;
+import org.jetbrains.jps.builders.impl.BuildDataPathsImpl;
 import org.jetbrains.jps.model.java.JpsJavaDependencyScope;
 import org.jetbrains.jps.model.java.JpsJavaExtensionService;
 import org.jetbrains.jps.model.module.JpsModule;
@@ -432,6 +434,15 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase {
         makeAll().assertSuccessful();
     }
 
+    public void testDoNotCreateUselessKotlinIncrementalCaches() throws InterruptedException {
+        initProject();
+        makeAll().assertSuccessful();
+
+        File storageRoot = new BuildDataPathsImpl(myDataStorageRoot).getDataStorageRoot();
+        assertTrue(new File(storageRoot, "targets/java-test/kotlinProject/kotlin").exists());
+        assertFalse(new File(storageRoot, "targets/java-production/kotlinProject/kotlin").exists());
+    }
+
     @NotNull
     private JpsModule findModule(@NotNull String name) {
         for (JpsModule module : myProject.getModules()) {
diff --git a/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/kotlinProject.iml b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/kotlinProject.iml
new file mode 100644
index 00000000000..a441b33e10b
--- /dev/null
+++ b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/kotlinProject.iml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <orderEntry type="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="kotlinProject" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/kotlinProject.ipr b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/kotlinProject.ipr
new file mode 100644
index 00000000000..90747786771
--- /dev/null
+++ b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/kotlinProject.ipr
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="DEFAULT_COMPILER" value="Javac" />
+  </component>
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
+    </modules>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/src/Src.java b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/src/Src.java
new file mode 100644
index 00000000000..9afa4b2097c
--- /dev/null
+++ b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/src/Src.java
@@ -0,0 +1,2 @@
+class Src {
+}
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/test/test.kt b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/test/test.kt
new file mode 100644
index 00000000000..c133c83fce7
--- /dev/null
+++ b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/test/test.kt
@@ -0,0 +1,3 @@
+fun test() {
+    val x = 5 + 5
+}
\ No newline at end of file