diff --git a/platform/testFramework/testSrc/com/intellij/codeInsight/unwrap/UnwrapTestCase.java b/platform/testFramework/src/com/intellij/codeInsight/unwrap/UnwrapTestCase.java
similarity index 78%
rename from platform/testFramework/testSrc/com/intellij/codeInsight/unwrap/UnwrapTestCase.java
rename to platform/testFramework/src/com/intellij/codeInsight/unwrap/UnwrapTestCase.java
index 0b44c3d75843..69cab7005f89 100644
--- a/platform/testFramework/testSrc/com/intellij/codeInsight/unwrap/UnwrapTestCase.java
+++ b/platform/testFramework/src/com/intellij/codeInsight/unwrap/UnwrapTestCase.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2000-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.
+ * 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.codeInsight.unwrap;
 
 import com.intellij.openapi.actionSystem.AnAction;
@@ -48,6 +63,7 @@ public abstract class UnwrapTestCase extends LightPlatformCodeInsightTestCase {
 
     h.invoke(getProject(), getEditor(), getFile());
 
+    //noinspection MisorderedAssertEqualsArguments
     assertEquals(Arrays.asList(expectedOptions), actualOptions);
   }
 
diff --git a/platform/testFramework/testSrc/com/intellij/openapi/editor/colors/editorColorScheme.kt b/platform/testFramework/src/com/intellij/openapi/editor/colors/editorColorScheme.kt
similarity index 100%
rename from platform/testFramework/testSrc/com/intellij/openapi/editor/colors/editorColorScheme.kt
rename to platform/testFramework/src/com/intellij/openapi/editor/colors/editorColorScheme.kt
diff --git a/platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java b/platform/testFramework/src/com/intellij/openapi/keymap/KeymapsTestCase.java
similarity index 100%
rename from platform/testFramework/testSrc/com/intellij/openapi/keymap/KeymapsTestCase.java
rename to platform/testFramework/src/com/intellij/openapi/keymap/KeymapsTestCase.java
diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/InMemoryFsRule.kt b/platform/testFramework/src/com/intellij/testFramework/InMemoryFsRule.kt
similarity index 100%
rename from platform/testFramework/testSrc/com/intellij/testFramework/InMemoryFsRule.kt
rename to platform/testFramework/src/com/intellij/testFramework/InMemoryFsRule.kt
diff --git a/platform/testFramework/testFramework.iml b/platform/testFramework/testFramework.iml
index 1cd589c3830e..eddcaa673627 100644
--- a/platform/testFramework/testFramework.iml
+++ b/platform/testFramework/testFramework.iml
@@ -26,7 +26,7 @@
     <orderEntry type="module" module-name="RegExpSupport" exported="" scope="RUNTIME" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="assertJ" level="project" />
-    <orderEntry type="library" scope="TEST" name="memoryfilesystem" level="project" />
+    <orderEntry type="library" name="memoryfilesystem" level="project" />
     <orderEntry type="module" module-name="boot" />
   </component>
 </module>
\ No newline at end of file