diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
index a782ce77563..350e1723ac8 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
@@ -52,7 +52,7 @@ public abstract class CodegenTestCase extends UsefulTestCase {
     // for environment and classloader
     protected JetCoreEnvironment myEnvironment;
     private List<File> extraClasspath = Lists.newArrayList();
-    protected JetFile myFile;
+    protected CodegenTestFile myFile;
 
     protected void createEnvironmentWithMockJdkAndIdeaAnnotations() {
         if (myEnvironment != null) {
@@ -104,13 +104,13 @@ public abstract class CodegenTestCase extends UsefulTestCase {
     }
 
     protected void loadText(final String text) {
-        myFile = (JetFile) JetTestUtils.createFile("a.jet", text, myEnvironment.getProject());
+        myFile = CodegenTestFile.create("a.jet", text, myEnvironment.getProject());
     }
 
     protected String loadFile(final String name) {
         try {
             final String content = JetTestUtils.doLoadFile(JetParsingTest.getTestDataDir() + "/codegen/", name);
-            myFile = (JetFile) JetTestUtils.createFile(name, content, myEnvironment.getProject());
+            myFile = CodegenTestFile.create(name, content, myEnvironment.getProject());
             return content;
         } catch (IOException e) {
             throw new RuntimeException(e);
@@ -126,9 +126,7 @@ public abstract class CodegenTestCase extends UsefulTestCase {
     }
 
     protected void blackBoxFile(String filename) {
-        String content = loadFile(filename);
-        Matcher matcher = Pattern.compile("// expected: (.*)").matcher(content);
-        String expectedValue = matcher.find() ? matcher.group(1) : "OK";
+        loadFile(filename);
         Object actual;
         try {
             actual = blackBox();
@@ -139,10 +137,10 @@ public abstract class CodegenTestCase extends UsefulTestCase {
             System.out.println(generateToText());
             throw new RuntimeException(e);
         }
-        if (!Objects.equal(expectedValue, actual)) {
+        if (!Objects.equal(myFile.getExpectedValue(), actual)) {
             System.out.println(generateToText());
         }
-        assertEquals(expectedValue, actual);
+        assertEquals(myFile.getExpectedValue(), actual);
     }
 
     @NotNull
@@ -151,7 +149,7 @@ public abstract class CodegenTestCase extends UsefulTestCase {
         GeneratedClassLoader loader = createClassLoader(codegens);
 
         try {
-            if (myFile.isScript()) {
+            if (myFile.getPsiFile().isScript()) {
                 Class<?> scriptClass = loader.loadClass("Script");
                 Object scriptInstance = scriptClass.newInstance();
                 Field field = scriptClass.getDeclaredField("rv");
@@ -160,7 +158,7 @@ public abstract class CodegenTestCase extends UsefulTestCase {
                 return result != null ? result.toString() : "null";
             }
             else {
-                String fqName = NamespaceCodegen.getJVMClassNameForKotlinNs(JetPsiUtil.getFQName(myFile)).getFqName().getFqName();
+                String fqName = NamespaceCodegen.getJVMClassNameForKotlinNs(JetPsiUtil.getFQName(myFile.getPsiFile())).getFqName().getFqName();
                 Class<?> namespaceClass = loader.loadClass(fqName);
                 Method method = namespaceClass.getMethod("box");
                 return (String) method.invoke(null);
@@ -185,10 +183,10 @@ public abstract class CodegenTestCase extends UsefulTestCase {
 
     private GenerationState generateCommon(ClassBuilderFactory classBuilderFactory) {
         final AnalyzeExhaust analyzeExhaust = AnalyzerFacadeForJVM.analyzeOneFileWithJavaIntegrationAndCheckForErrors(
-                myFile, myEnvironment.getCompilerDependencies());
+                myFile.getPsiFile(), myEnvironment.getCompilerDependencies());
         analyzeExhaust.throwIfError();
         AnalyzingUtils.throwExceptionOnErrors(analyzeExhaust.getBindingContext());
-        GenerationState state = new GenerationState(myEnvironment.getProject(), classBuilderFactory, analyzeExhaust, Collections.singletonList(myFile));
+        GenerationState state = new GenerationState(myEnvironment.getProject(), classBuilderFactory, analyzeExhaust, Collections.singletonList(myFile.getPsiFile()));
         state.compileCorrectFiles(CompilationErrorHandler.THROW_EXCEPTION);
         return state;
     }
@@ -204,7 +202,7 @@ public abstract class CodegenTestCase extends UsefulTestCase {
     }
 
     protected Class loadRootNamespaceClass(@NotNull ClassFileFactory state) {
-        String fqName = NamespaceCodegen.getJVMClassNameForKotlinNs(JetPsiUtil.getFQName(myFile)).getFqName().getFqName();
+        String fqName = NamespaceCodegen.getJVMClassNameForKotlinNs(JetPsiUtil.getFQName(myFile.getPsiFile())).getFqName().getFqName();
         try {
             return createClassLoader(state).loadClass(fqName);
         } catch (ClassNotFoundException e) {
diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestFile.java b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestFile.java
new file mode 100644
index 00000000000..7755bfde19b
--- /dev/null
+++ b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestFile.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2010-2012 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 org.jetbrains.jet.codegen;
+
+import com.intellij.openapi.project.Project;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.JetTestUtils;
+import org.jetbrains.jet.lang.psi.JetFile;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author Stepan Koltsov
+ */
+public class CodegenTestFile {
+
+    @NotNull
+    private final JetFile psiFile;
+    @NotNull
+    private final String expectedValue;
+
+    private CodegenTestFile(@NotNull JetFile psiFile, @NotNull String expectedValue) {
+        this.psiFile = psiFile;
+        this.expectedValue = expectedValue;
+    }
+
+    @NotNull
+    public JetFile getPsiFile() {
+        return psiFile;
+    }
+
+    @NotNull
+    public String getExpectedValue() {
+        return expectedValue;
+    }
+
+    @NotNull
+    public static CodegenTestFile create(@NotNull String name, @NotNull String content, @NotNull Project project) {
+        JetFile file = (JetFile) JetTestUtils.createFile(name, content, project);
+
+        Matcher matcher = Pattern.compile("// expected: (.*)").matcher(content);
+        String expectedValue = matcher.find() ? matcher.group(1) : "OK";
+
+        return new CodegenTestFile(file, expectedValue);
+    }
+}
diff --git a/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java b/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java
index 6333a97ac2a..d2015cb0f0a 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java
@@ -146,7 +146,7 @@ public class StdlibTest extends CodegenTestCase {
         GeneratedClassLoader loader = createClassLoader(codegens);
 
         try {
-            String fqName = NamespaceCodegen.getJVMClassNameForKotlinNs(JetPsiUtil.getFQName(myFile)).getFqName().getFqName();
+            String fqName = NamespaceCodegen.getJVMClassNameForKotlinNs(JetPsiUtil.getFQName(myFile.getPsiFile())).getFqName().getFqName();
             Class<?> namespaceClass = loader.loadClass(fqName);
             Method method = namespaceClass.getMethod("box", Method.class);
             method.setAccessible(true);