diff --git a/xml/tests/src/com/intellij/codeInsight/completion/XmlCompletionTest.java b/xml/tests/src/com/intellij/codeInsight/completion/XmlCompletionTest.java
index 99fe3391f654..a3a580a1e752 100644
--- a/xml/tests/src/com/intellij/codeInsight/completion/XmlCompletionTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/completion/XmlCompletionTest.java
@@ -134,6 +134,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
 
     configureByFiles("36_3.xml");
     complete();
+    myFixture.type('\n');
     checkResultByFile("36_3_after.xml");
   }
 
@@ -424,8 +425,20 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
 
   public void testDoNotSuggestTagsFromOtherNsInXslt() throws Exception {
     basicDoTest("");
-    basicDoTest("_2");
-    basicDoTest("_3");
+  }
+
+  public void testDoNotSuggestTagsFromOtherNsInXslt_2() throws Exception {
+    final String testName = getTestName(false);
+    configureByFile(testName + ".xml");
+    myFixture.type('\n');
+    checkResultByFile(testName + "_after.xml");
+  }
+  
+  public void testDoNotSuggestTagsFromOtherNsInXslt_3() throws Exception {
+    final String testName = getTestName(false);
+    configureByFile(testName + ".xml");
+    myFixture.type('\n');
+    checkResultByFile(testName + "_after.xml");
   }
 
   public void testDoNotSuggestTagsInXHtml() throws Exception {
@@ -440,6 +453,7 @@ public class XmlCompletionTest extends LightCodeInsightFixtureTestCase {
   public void testCompleteWithSubstitutionGroup() throws Exception {
     configureByFiles(getTestName(false) + ".xml", "mule.xsd", "mule-management.xsd");
     complete();
+    myFixture.type('\n');
     checkResultByFile(getTestName(false) + "_after.xml");
   }
 
diff --git a/xml/tests/testData/completion/36_3_after.xml b/xml/tests/testData/completion/36_3_after.xml
index e0645233d4a4..181945e22692 100644
--- a/xml/tests/testData/completion/36_3_after.xml
+++ b/xml/tests/testData/completion/36_3_after.xml
@@ -10,6 +10,6 @@
                             http://www.springframework.org/schema/util
                             http://www.springframework.org/schema/util/spring-util-2.0.xsd">
    <util:list id="list1">
-     <util:<caret>
+     <util:constant static-field=""<caret>
    </util:list>
 </beans>
\ No newline at end of file
diff --git a/xml/tests/testData/completion/CompleteWithSubstitutionGroup_after.xml b/xml/tests/testData/completion/CompleteWithSubstitutionGroup_after.xml
index d91132ea0d89..c542f3276f05 100644
--- a/xml/tests/testData/completion/CompleteWithSubstitutionGroup_after.xml
+++ b/xml/tests/testData/completion/CompleteWithSubstitutionGroup_after.xml
@@ -8,5 +8,5 @@
         http://www.mulesource.org/schema/mule/management/2.0 mule-management.xsd
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-    <management:<caret>
+    <management:chainsaw-notifications chainsawHost="" chainsawPort=""<caret>
 </mule>
\ No newline at end of file
diff --git a/xml/tests/testData/completion/DoNotSuggestTagsFromOtherNsInXslt_2_after.xml b/xml/tests/testData/completion/DoNotSuggestTagsFromOtherNsInXslt_2_after.xml
index 026f371303af..07f2c1a4012e 100644
--- a/xml/tests/testData/completion/DoNotSuggestTagsFromOtherNsInXslt_2_after.xml
+++ b/xml/tests/testData/completion/DoNotSuggestTagsFromOtherNsInXslt_2_after.xml
@@ -5,7 +5,7 @@
   <xsl:template match="/*">
     <taglib>
       <xsl:if test="@version">
-        <tlib-version><xsl:apply-<caret></tlib-version>
+        <tlib-version><xsl:apply-imports/><caret></tlib-version>
       </xsl:if>
     </taglib>
   </xsl:template>
diff --git a/xml/tests/testData/completion/DoNotSuggestTagsFromOtherNsInXslt_3_after.xml b/xml/tests/testData/completion/DoNotSuggestTagsFromOtherNsInXslt_3_after.xml
index 4fee72a4039c..5ff46830b487 100644
--- a/xml/tests/testData/completion/DoNotSuggestTagsFromOtherNsInXslt_3_after.xml
+++ b/xml/tests/testData/completion/DoNotSuggestTagsFromOtherNsInXslt_3_after.xml
@@ -5,7 +5,7 @@
   <xsl:template match="/*">
     <taglib>
       <xsl:if test="@version">
-        <tlib-version><xsl:apply-<caret></tlib-version>
+        <tlib-version><xsl:apply-imports/><caret></tlib-version>
       </xsl:if>
     </taglib>
   </xsl:template>