diff --git a/.idea/modules.xml b/.idea/modules.xml
index 064010d8399b..44693dcf252d 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -238,7 +238,6 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/tasks/tasks-java/tasks-java.iml" filepath="$PROJECT_DIR$/plugins/tasks/tasks-java/tasks-java.iml" group="plugins/tasks" />
       <module fileurl="file://$PROJECT_DIR$/plugins/tasks/tasks-tests/tasks-tests.iml" filepath="$PROJECT_DIR$/plugins/tasks/tasks-tests/tasks-tests.iml" group="plugins/tasks" />
       <module fileurl="file://$PROJECT_DIR$/plugins/terminal/terminal.iml" filepath="$PROJECT_DIR$/plugins/terminal/terminal.iml" group="plugins" />
-      <module fileurl="file://$PROJECT_DIR$/platform/testFramework/test-framework-java8.iml" filepath="$PROJECT_DIR$/platform/testFramework/test-framework-java8.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/testFramework/testFramework.iml" filepath="$PROJECT_DIR$/platform/testFramework/testFramework.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/java/testFramework/testFramework-java.iml" filepath="$PROJECT_DIR$/java/testFramework/testFramework-java.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/platform/testRunner/testRunner.iml" filepath="$PROJECT_DIR$/platform/testRunner/testRunner.iml" group="platform" />
diff --git a/platform/built-in-server/built-in-server-tests.iml b/platform/built-in-server/built-in-server-tests.iml
index af9d31a88f4a..1ee2004f04e2 100644
--- a/platform/built-in-server/built-in-server-tests.iml
+++ b/platform/built-in-server/built-in-server-tests.iml
@@ -22,6 +22,5 @@
     <orderEntry type="module" module-name="vcs-api" />
     <orderEntry type="library" scope="TEST" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
-    <orderEntry type="module" module-name="test-framework-java8" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/configuration-store-impl/testSrc/configuration-store-tests.iml b/platform/configuration-store-impl/testSrc/configuration-store-tests.iml
index d563be49ab2b..cc0f357793cc 100644
--- a/platform/configuration-store-impl/testSrc/configuration-store-tests.iml
+++ b/platform/configuration-store-impl/testSrc/configuration-store-tests.iml
@@ -18,6 +18,5 @@
     <orderEntry type="module" module-name="eclipse" scope="TEST" />
     <orderEntry type="module" module-name="configuration-store-impl" />
     <orderEntry type="module" module-name="util-tests" scope="TEST" />
-    <orderEntry type="module" module-name="test-framework-java8" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/testFramework/test-framework-java8/FixtureRule.kt b/platform/testFramework/src/com/intellij/testFramework/FixtureRule.kt
similarity index 100%
rename from platform/testFramework/test-framework-java8/FixtureRule.kt
rename to platform/testFramework/src/com/intellij/testFramework/FixtureRule.kt
diff --git a/platform/testFramework/test-framework-java8/TemporaryDirectory.kt b/platform/testFramework/src/com/intellij/testFramework/TemporaryDirectory.kt
similarity index 100%
rename from platform/testFramework/test-framework-java8/TemporaryDirectory.kt
rename to platform/testFramework/src/com/intellij/testFramework/TemporaryDirectory.kt
diff --git a/platform/testFramework/test-framework-java8/assertJ.kt b/platform/testFramework/src/com/intellij/testFramework/assertJ.kt
similarity index 100%
rename from platform/testFramework/test-framework-java8/assertJ.kt
rename to platform/testFramework/src/com/intellij/testFramework/assertJ.kt
diff --git a/platform/testFramework/src/com/intellij/testFramework/fsBuilder.kt b/platform/testFramework/src/com/intellij/testFramework/fsBuilder.kt
new file mode 100644
index 000000000000..3488972488e8
--- /dev/null
+++ b/platform/testFramework/src/com/intellij/testFramework/fsBuilder.kt
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2000-2015 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.testFramework
+
+import java.nio.file.FileSystem
+
+fun FileSystem.file(path: String, data: ByteArray): FileSystem {
+  getPath(path).write(data)
+  return this
+}
+
+fun FileSystem.file(path: String, data: String) = file(path, data.toByteArray())
\ No newline at end of file
diff --git a/platform/testFramework/test-framework-java8/path.kt b/platform/testFramework/src/com/intellij/testFramework/path.kt
similarity index 83%
rename from platform/testFramework/test-framework-java8/path.kt
rename to platform/testFramework/src/com/intellij/testFramework/path.kt
index 0e354d5d822a..d2c5f95e763a 100644
--- a/platform/testFramework/test-framework-java8/path.kt
+++ b/platform/testFramework/src/com/intellij/testFramework/path.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2000-2015 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.intellij.testFramework
 
 import com.intellij.openapi.util.io.FileUtil
diff --git a/platform/testFramework/test-framework-java8.iml b/platform/testFramework/test-framework-java8.iml
deleted file mode 100644
index 05d5f2939193..000000000000
--- a/platform/testFramework/test-framework-java8.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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$/test-framework-java8">
-      <sourceFolder url="file://$MODULE_DIR$/test-framework-java8/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test-framework-java8" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="testFramework" />
-    <orderEntry type="library" name="assertJ" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/platform/testFramework/test-framework-java8/fsBuilder.kt b/platform/testFramework/test-framework-java8/fsBuilder.kt
deleted file mode 100644
index ea32d71474af..000000000000
--- a/platform/testFramework/test-framework-java8/fsBuilder.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.intellij.testFramework
-
-import java.nio.file.FileSystem
-
-fun FileSystem.file(path: String, data: ByteArray): FileSystem {
-  getPath(path).write(data)
-  return this
-}
-
-fun FileSystem.file(path: String, data: String) = file(path, data.toByteArray())
\ No newline at end of file
diff --git a/platform/testFramework/testFramework.iml b/platform/testFramework/testFramework.iml
index 3c86f81a1070..88a71e9c566b 100644
--- a/platform/testFramework/testFramework.iml
+++ b/platform/testFramework/testFramework.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module relativePaths="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
@@ -25,5 +25,6 @@
     <orderEntry type="module" module-name="images" exported="" scope="RUNTIME" />
     <orderEntry type="module" module-name="RegExpSupport" exported="" scope="RUNTIME" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
+    <orderEntry type="library" name="assertJ" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/settings-repository/settings-repository-tests.iml b/plugins/settings-repository/settings-repository-tests.iml
index d443e18e45cf..a403eda57634 100644
--- a/plugins/settings-repository/settings-repository-tests.iml
+++ b/plugins/settings-repository/settings-repository-tests.iml
@@ -34,6 +34,5 @@
         </SOURCES>
       </library>
     </orderEntry>
-    <orderEntry type="module" module-name="test-framework-java8" />
   </component>
 </module>
\ No newline at end of file