diff --git a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestData.java b/platform/testFramework/src/com/intellij/codeInsight/CodeInsightTestData.java
similarity index 97%
rename from java/testFramework/src/com/intellij/codeInsight/CodeInsightTestData.java
rename to platform/testFramework/src/com/intellij/codeInsight/CodeInsightTestData.java
index 202db1b16b2e..bf64ef6a536f 100644
--- a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestData.java
+++ b/platform/testFramework/src/com/intellij/codeInsight/CodeInsightTestData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * 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.
diff --git a/java/testFramework/src/com/intellij/codeInsight/EditorInfo.java b/platform/testFramework/src/com/intellij/codeInsight/EditorInfo.java
similarity index 94%
rename from java/testFramework/src/com/intellij/codeInsight/EditorInfo.java
rename to platform/testFramework/src/com/intellij/codeInsight/EditorInfo.java
index cd4e97a54ed9..4f1aab369a81 100644
--- a/java/testFramework/src/com/intellij/codeInsight/EditorInfo.java
+++ b/platform/testFramework/src/com/intellij/codeInsight/EditorInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * 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.
@@ -24,7 +24,7 @@ import com.intellij.testFramework.EditorTestUtil;
  * @author cdr
  */
 public class EditorInfo {
-  String newFileText = null;
+  private final String newFileText;
   public EditorTestUtil.CaretAndSelectionState caretState;
 
   public EditorInfo(final String fileText) {
diff --git a/java/testFramework/src/com/intellij/testFramework/PsiTestData.java b/platform/testFramework/src/com/intellij/testFramework/PsiTestData.java
similarity index 97%
rename from java/testFramework/src/com/intellij/testFramework/PsiTestData.java
rename to platform/testFramework/src/com/intellij/testFramework/PsiTestData.java
index 2691de216c35..83c08c07eaae 100644
--- a/java/testFramework/src/com/intellij/testFramework/PsiTestData.java
+++ b/platform/testFramework/src/com/intellij/testFramework/PsiTestData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * 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.