diff --git a/build-common/build-common.iml b/build-common/build-common.iml
index 9ab68bfb5dc..bfd5c022d4a 100644
--- a/build-common/build-common.iml
+++ b/build-common/build-common.iml
@@ -4,6 +4,7 @@
     <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="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -14,4 +15,4 @@
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
   </component>
-</module>
+</module>
\ No newline at end of file
diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt b/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/classFilesComparison.kt
similarity index 97%
rename from jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt
rename to build-common/test/org/jetbrains/kotlin/incremental/testingUtils/classFilesComparison.kt
index 64f7260b6f5..bfcccb82ad5 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt
+++ b/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/classFilesComparison.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.jps.build.classFilesComparison
+package org.jetbrains.kotlin.incremental.testingUtils
 
 import com.google.common.collect.Sets
 import com.google.common.hash.Hashing
@@ -36,7 +36,7 @@ import java.io.File
 import java.io.PrintWriter
 import java.io.StringWriter
 import java.util.*
-import kotlin.comparisons.*
+import kotlin.comparisons.compareBy
 
 
 // Set this to true if you want to dump all bytecode (test will fail in this case)
diff --git a/build-common/src/org/jetbrains/kotlin/incremental/testingUtils/incrementalModificationUtils.kt b/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/incrementalModificationUtils.kt
similarity index 100%
rename from build-common/src/org/jetbrains/kotlin/incremental/testingUtils/incrementalModificationUtils.kt
rename to build-common/test/org/jetbrains/kotlin/incremental/testingUtils/incrementalModificationUtils.kt
diff --git a/build.xml b/build.xml
index 06f13043b73..968b3be1a80 100644
--- a/build.xml
+++ b/build.xml
@@ -655,6 +655,40 @@
         </jar>
     </target>
 
+    <target name="kotlin-build-common-test" depends="kotlin-build-common,kotlin-test">
+        <cleandir dir="${output}/classes/kotlin-build-common-test"/>
+
+        <javac2 destdir="${output}/classes/kotlin-build-common-test" debug="true" debuglevel="lines,vars,source" includeAntRuntime="false"
+                source="${java.target}" target="${java.target}">
+            <withKotlin modulename="kotlin-build-common"/>
+            <skip pattern="kotlin/jvm/internal/.*"/>
+            <src path="build-common/test"/>
+            <classpath>
+                <pathelement path="${bootstrap.runtime}"/>
+                <pathelement path="${bootstrap.reflect}"/>
+                <pathelement path="${bootstrap.kotlin.test}"/>
+                <pathelement path="${idea.sdk}/lib/junit-4.12.jar"/>
+                <pathelement path="${idea.sdk}/lib/guava-17.0.jar"/>
+                <pathelement path="${kotlin-home}/lib/kotlin-build-common.jar"/>
+                <pathelement path="${kotlin-home}/lib/kotlin-compiler.jar"/>
+                <pathelement path="${protobuf.jar}"/>
+            </classpath>
+        </javac2>
+
+        <jar destfile="${kotlin-home}/lib/kotlin-build-common-test.jar">
+            <fileset dir="${output}/classes/kotlin-build-common-test"/>
+            <zipfileset file="${kotlin-home}/build.txt" prefix="META-INF"/>
+
+            <manifest>
+                <attribute name="Built-By" value="${manifest.impl.vendor}"/>
+
+                <attribute name="Implementation-Vendor" value="${manifest.impl.vendor}"/>
+                <attribute name="Implementation-Title" value="${manifest.impl.title.kotlin.build.common}"/>
+                <attribute name="Implementation-Version" value="${build.number}"/>
+            </manifest>
+        </jar>
+    </target>
+
     <target name="daemon-client">
         <cleandir dir="${output}/classes/daemon-client"/>
 
@@ -1040,7 +1074,7 @@
             depends="builtins,stdlib,kotlin-test,core,reflection,pack-runtime,pack-runtime-sources,mock-runtime-for-test"/>
 
     <target name="dist"
-            depends="clean,init,prepare-dist,preloader,runner,serialize-builtins,compiler,compiler-sources,kotlin-build-common,ant-tools,runtime,kotlin-js-stdlib,android-compiler-plugin,daemon-client"
+            depends="clean,init,prepare-dist,preloader,runner,serialize-builtins,compiler,compiler-sources,kotlin-build-common,ant-tools,runtime,kotlin-js-stdlib,android-compiler-plugin,daemon-client,kotlin-build-common-test"
             description="Builds redistributables from sources"/>
 
     <target name="dist-quick"
diff --git a/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml b/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml
index e99b5a3918b..a6a5f690c4a 100644
--- a/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml
+++ b/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml
@@ -7,10 +7,11 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="build-common" scope="TEST" />
     <orderEntry type="module" module-name="jps-plugin" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="jps" level="project" />
     <orderEntry type="library" scope="TEST" name="jps-test" level="project" />
     <orderEntry type="library" scope="TEST" name="idea-full" level="project" />
+    <orderEntry type="library" scope="TEST" name="build-common" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java b/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java
index ea0dbc4c9f5..39c0146cdca 100644
--- a/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java
+++ b/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java
@@ -21,8 +21,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.builders.BuildResult;
 import org.jetbrains.jps.model.module.JpsModule;
 import org.jetbrains.jps.model.module.JpsModuleSourceRoot;
+import org.jetbrains.kotlin.incremental.testingUtils.ClassFilesComparisonKt;
 import org.jetbrains.kotlin.jps.build.AbstractKotlinJpsBuildTestCase;
-import org.jetbrains.kotlin.jps.build.classFilesComparison.ClassFilesComparisonKt;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
index d285c1c5626..a1c52bc10a2 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
@@ -46,11 +46,7 @@ import org.jetbrains.jps.util.JpsPathUtil
 import org.jetbrains.kotlin.config.IncrementalCompilation
 import org.jetbrains.kotlin.incremental.LookupSymbol
 import org.jetbrains.kotlin.incremental.components.LookupTracker
-import org.jetbrains.kotlin.incremental.testingUtils.Modification
-import org.jetbrains.kotlin.incremental.testingUtils.TouchPolicy
-import org.jetbrains.kotlin.incremental.testingUtils.copyTestSources
-import org.jetbrains.kotlin.incremental.testingUtils.getModificationsToPerform
-import org.jetbrains.kotlin.jps.build.classFilesComparison.assertEqualDirectories
+import org.jetbrains.kotlin.incremental.testingUtils.*
 import org.jetbrains.kotlin.jps.incremental.JpsLookupStorageProvider
 import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget
 import org.jetbrains.kotlin.jps.incremental.getKotlinCache