diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
index 153b2939914d..f736ecd96823 100644
--- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
+++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
@@ -1343,10 +1343,9 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig
         assert myEditor != null : "Editor couldn't be created for file: " +
                                   copy.getPath() +
                                   ", use copyFileToProject(..) method for this file instead of configureByFile(..)";
-        if (loader.caretMarker != null) {
-          int offset = loader.caretMarker.getStartOffset();
-          myEditor.getCaretModel().moveToOffset(offset);
-        }
+        int offset = loader.caretMarker != null ? loader.caretMarker.getStartOffset() : 0;
+        myEditor.getCaretModel().moveToOffset(offset);
+
         if (loader.selStartMarker != null && loader.selEndMarker != null) {
           int start = loader.selStartMarker.getStartOffset();
           int end = loader.selEndMarker.getStartOffset();
@@ -1357,6 +1356,9 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig
             myEditor.getSelectionModel().setSelection(start, end);
           }
         }
+        else {
+          myEditor.getSelectionModel().removeSelection();
+        }
 
         Module module = getModule();
         if (module != null) {