diff --git a/java/testFramework/src/com/intellij/testFramework/fixtures/JavaTestFixtureFactory.java b/java/testFramework/src/com/intellij/testFramework/fixtures/JavaTestFixtureFactory.java
index 5826401464ed..b7b03b1de9df 100644
--- a/java/testFramework/src/com/intellij/testFramework/fixtures/JavaTestFixtureFactory.java
+++ b/java/testFramework/src/com/intellij/testFramework/fixtures/JavaTestFixtureFactory.java
@@ -15,8 +15,6 @@
  */
 package com.intellij.testFramework.fixtures;
 
-import com.intellij.testFramework.fixtures.impl.IdeaTestFixtureFactoryImpl;
-
 /**
  * @author yole
  */
@@ -29,7 +27,7 @@ public abstract class JavaTestFixtureFactory {
       ourInstance = (JavaTestFixtureFactory)aClass.newInstance();
     }
     catch (Exception e) {
-      throw new RuntimeException("Can't instnatiate factory", e);
+      throw new RuntimeException("Can't instantiate factory", e);
     }
   }
 
@@ -45,6 +43,6 @@ public abstract class JavaTestFixtureFactory {
 
   //also implicitly initializes ourInstance and registers java module fixture builder
   public static TestFixtureBuilder<IdeaProjectTestFixture> createFixtureBuilder() {
-    return IdeaTestFixtureFactoryImpl.getFixtureFactory().createFixtureBuilder();
+    return IdeaTestFixtureFactory.getFixtureFactory().createFixtureBuilder();
   }
 }
diff --git a/java/testFramework/src/com/intellij/testFramework/fixtures/impl/JavaTestFixtureFactoryImpl.java b/java/testFramework/src/com/intellij/testFramework/fixtures/impl/JavaTestFixtureFactoryImpl.java
index ee5f61f97a02..e78a22b41e22 100644
--- a/java/testFramework/src/com/intellij/testFramework/fixtures/impl/JavaTestFixtureFactoryImpl.java
+++ b/java/testFramework/src/com/intellij/testFramework/fixtures/impl/JavaTestFixtureFactoryImpl.java
@@ -24,7 +24,7 @@ import com.intellij.testFramework.fixtures.*;
  */
 public class JavaTestFixtureFactoryImpl extends JavaTestFixtureFactory {
   public JavaTestFixtureFactoryImpl() {
-    IdeaTestFixtureFactoryImpl.getFixtureFactory().registerFixtureBuilder(JavaModuleFixtureBuilder.class, MyJavaModuleFixtureBuilderImpl.class);
+    IdeaTestFixtureFactory.getFixtureFactory().registerFixtureBuilder(JavaModuleFixtureBuilder.class, MyJavaModuleFixtureBuilderImpl.class);
   }
 
   @Override