diff --git a/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java b/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java
index 50b5931cdaf3..42dec3a765fa 100644
--- a/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java
+++ b/plugins/junit/test/com/intellij/execution/junit/JUnitTreeByDescriptionHierarchyTest.java
@@ -60,45 +60,45 @@ public class JUnitTreeByDescriptionHierarchyTest {
 
 
            "##teamcity[rootName name = 'root' location = 'java:suite://root']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='TestA' locationHint='java:suite://a.TestA']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='|[0|]' locationHint='java:suite://a.TestA.|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='testName|[0|]' locationHint='java:test://a.TestA/testName|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='testName|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='|[1|]' locationHint='java:suite://a.TestA.|[1|]']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='testName|[1|]' locationHint='java:test://a.TestA/testName|[1|]']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='testName|[1|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='|[1|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='TestA']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='TestB' locationHint='java:suite://a.TestB']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='|[0|]' locationHint='java:suite://a.TestB.|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='testName|[0|]' locationHint='java:test://a.TestB/testName|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='testName|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='|[1|]' locationHint='java:suite://a.TestB.|[1|]']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='testName|[1|]' locationHint='java:test://a.TestB/testName|[1|]']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='testName|[1|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='|[1|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='TestB']\n");
   }
 
@@ -123,17 +123,17 @@ public class JUnitTreeByDescriptionHierarchyTest {
     }
     sender.testRunFinished(new Result());
     Assert.assertEquals("output: " + buf, "##teamcity[enteredTheMatrix]\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteStarted name='ATest' locationHint='java:suite://ATest']\n" +
-                                          "\n" +
+
                                           "##teamcity[testStarted name='ATest.test1' locationHint='java:test://ATest/test1']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFinished name='ATest.test1']\n" +
-                                          "\n" +
+
                                           "##teamcity[testStarted name='ATest.test2' locationHint='java:test://ATest/test2']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFinished name='ATest.test2']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteFinished name='ATest']\n", StringUtil.convertLineSeparators(buf.toString()));
   }
 
@@ -157,21 +157,21 @@ public class JUnitTreeByDescriptionHierarchyTest {
                                    "##teamcity[suiteTreeEnded name='MyTest']\n" +
                                    "##teamcity[treeEnded]\n",
            "##teamcity[rootName name = 'root' location = 'java:suite://root']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='MyTest' locationHint='java:suite://a.MyTest']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='MyTest.testMe' locationHint='java:test://a.MyTest/testMe']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='MyTest.testMe']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='MyTest']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='MyTest' locationHint='java:suite://b.MyTest']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='MyTest.testMe' locationHint='java:test://b.MyTest/testMe']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='MyTest.testMe']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='MyTest']\n");
   }
 
@@ -193,21 +193,21 @@ public class JUnitTreeByDescriptionHierarchyTest {
            "##teamcity[treeEnded]\n",
            //start
            "##teamcity[rootName name = 'TestA' comment = 'a' location = 'java:suite://a.TestA']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='|[0|]' locationHint='java:suite://a.TestA.|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='testName|[0|]' locationHint='java:test://a.TestA/testName|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='testName|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='|[1|]' locationHint='java:suite://a.TestA.|[1|]']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='testName|[1|]' locationHint='java:test://a.TestA/testName|[1|]']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='testName|[1|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='|[1|]']\n");
   }
 
@@ -235,21 +235,21 @@ public class JUnitTreeByDescriptionHierarchyTest {
            "##teamcity[treeEnded]\n",
            //start
            "##teamcity[rootName name = 'TestA' comment = 'a' location = 'java:suite://a.TestA']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='|[0|]' locationHint='java:suite://a.TestA.|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='testName|[0|]' locationHint='java:test://a.TestA/testName|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='testName|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='|[0|]' locationHint='java:suite://a.TestA.|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='testName|[0|]' locationHint='java:test://a.TestA/testName|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='testName|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='|[0|]']\n");
   }
 
@@ -277,21 +277,21 @@ public class JUnitTreeByDescriptionHierarchyTest {
            "##teamcity[treeEnded]\n",
            //start
            "##teamcity[rootName name = 'TestA' comment = 'a' location = 'java:suite://a.TestA']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='|[0: with - 1.1|]' locationHint='java:suite://a.TestA.|[0: with - 1.1|]']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='testName|[0: with - 1.1|]' locationHint='java:test://a.TestA/testName|[0: with - 1.1|]']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='testName|[0: with - 1.1|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='|[0: with - 1.1|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='|[1: with - 2.1|]' locationHint='java:suite://a.TestA.|[1: with - 2.1|]']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='testName|[1: with - 2.1|]' locationHint='java:test://a.TestA/testName|[1: with - 2.1|]']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='testName|[1: with - 2.1|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='|[1: with - 2.1|]']\n");
   }
 
@@ -328,29 +328,29 @@ public class JUnitTreeByDescriptionHierarchyTest {
 
            //started
            "##teamcity[rootName name = 'root' location = 'java:suite://root']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='ASuite1' locationHint='java:suite://ASuite1']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='ATest' locationHint='java:suite://ATest']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='ATest.test1' locationHint='java:test://ATest/test1']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='ATest.test1']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='ATest']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='ASuite1']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='ASuite2' locationHint='java:suite://ASuite2']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='ATest' locationHint='java:suite://ATest']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='ATest.test1' locationHint='java:test://ATest/test1']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='ATest.test1']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='ATest']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='ASuite2']\n");
   }
 
@@ -409,25 +409,25 @@ public class JUnitTreeByDescriptionHierarchyTest {
     sender.testRunFinished(new Result());
 
     Assert.assertEquals("output: " + buf, "##teamcity[rootName name = 'root' location = 'java:suite://root']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteStarted name='TestA' locationHint='java:suite://TestA']\n" +
-                                          "\n" +
+
                                           "##teamcity[testStarted name='TestA.testName' locationHint='java:test://TestA/testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testIgnored name='TestA.testName' error='true' message='' details='java.lang.Exception|n']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFinished name='TestA.testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteFinished name='TestA']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteStarted name='TestB' locationHint='java:suite://TestB']\n" +
-                                          "\n" +
+
                                           "##teamcity[testStarted name='TestB.testNameB' locationHint='java:test://TestB/testNameB']\n" +
-                                          "\n" +
+
                                           "##teamcity[testIgnored name='TestB.testNameB' error='true' message='' details='java.lang.Exception|n']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFinished name='TestB.testNameB']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteFinished name='TestB']\n", StringUtil.convertLineSeparators(buf.toString()));
   }
 
@@ -458,21 +458,21 @@ public class JUnitTreeByDescriptionHierarchyTest {
     sender.testRunFinished(new Result());
 
     Assert.assertEquals("output: " + buf, "##teamcity[rootName name = 'root' location = 'java:suite://root']\n" +
-                                          "\n" +
+
                                           "##teamcity[testStarted name='Class Configuration' locationHint='java:suite://TestA' ]\n" +
-                                          "\n" +
+
                                           "##teamcity[testFailed name='Class Configuration' error='true' message='' details='java.lang.Exception|n']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFinished name='Class Configuration']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteStarted name='TestA' locationHint='java:suite://TestA']\n" +
-                                          "\n" +
+
                                           "##teamcity[testStarted name='TestA.testName' locationHint='java:test://TestA/testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testIgnored name='TestA.testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFinished name='TestA.testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteFinished name='TestA']\n", StringUtil.convertLineSeparators(buf.toString()));
   }
 
@@ -489,7 +489,8 @@ public class JUnitTreeByDescriptionHierarchyTest {
     final Description description = Description.createTestDescription("A", "a");
     sender.testFailure(new Failure(description, new ComparisonFailure(buf.toString(), buf.toString(), "diff" + buf.toString())));
 
-    final String startMessage = "##teamcity[enteredTheMatrix]\n\n" +
+    final String startMessage = "##teamcity[enteredTheMatrix]\n" +
+
                                 "##teamcity[testFailed name='A.a' ";
     assertEquals(startMessage, StringUtil.convertLineSeparators(output.toString()).substring(0, startMessage.length()));
   }
@@ -527,23 +528,23 @@ public class JUnitTreeByDescriptionHierarchyTest {
     sender.testRunFinished(new Result());
 
     Assert.assertEquals("output: " + buf, "##teamcity[rootName name = 'root' location = 'java:suite://root']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteStarted name='TestA' locationHint='java:suite://TestA']\n" +
-                                          "\n" +
+
                                           "##teamcity[testStarted name='TestA.test1' locationHint='java:test://TestA/test1']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFailed name='TestA.test1' error='true' message='' details='java.lang.Exception|n']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFinished name='TestA.test1']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteFinished name='TestA']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteStarted name='TestB' locationHint='java:suite://TestB']\n" +
-                                          "\n" +
+
                                           "##teamcity[testStarted name='TestB.test2' locationHint='java:test://TestB/test2']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFinished name='TestB.test2']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteFinished name='TestB']\n", StringUtil.convertLineSeparators(buf.toString()));
   }
 
@@ -576,19 +577,19 @@ public class JUnitTreeByDescriptionHierarchyTest {
     sender.testRunFinished(new Result());
 
     Assert.assertEquals("output: " + buf, "##teamcity[rootName name = 'root' location = 'java:suite://root']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteStarted name='TestA' locationHint='java:suite://TestA']\n" +
-                                          "\n" +
+
                                           "##teamcity[testStarted name='TestA.testName' locationHint='java:test://TestA/testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFinished name='TestA.testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testStarted name='Class Configuration' locationHint='java:suite://TestA' ]\n" +
-                                          "\n" +
+
                                           "##teamcity[testFailed name='Class Configuration' error='true' message='' details='java.lang.Exception|n']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFinished name='Class Configuration']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteFinished name='TestA']\n", StringUtil.convertLineSeparators(buf.toString()));
   }
 
@@ -617,15 +618,15 @@ public class JUnitTreeByDescriptionHierarchyTest {
     sender.testRunFinished(new Result());
 
     Assert.assertEquals("output: " + buf, "##teamcity[rootName name = 'TestA' location = 'java:suite://TestA']\n" +
-                                          "\n" +
+
                                           "##teamcity[testStarted name='TestA.testName' locationHint='java:test://TestA/testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFinished name='TestA.testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testStarted name='Class Configuration' locationHint='java:suite://TestA' ]\n" +
-                                          "\n" +
+
                                           "##teamcity[testFailed name='Class Configuration' error='true' message='' details='java.lang.Exception|n']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFinished name='Class Configuration']\n", StringUtil.convertLineSeparators(buf.toString()));
   }
 
@@ -660,19 +661,19 @@ public class JUnitTreeByDescriptionHierarchyTest {
     sender.testRunFinished(new Result());
 
     Assert.assertEquals("output: " + buf, "##teamcity[rootName name = 'root' location = 'java:suite://root']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteStarted name='TestA' locationHint='java:suite://TestA']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteStarted name='param' locationHint='java:suite://param']\n" +
-                                          "\n" +
+
                                           "##teamcity[testStarted name='TestA.testName' locationHint='java:test://TestA/testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testIgnored name='TestA.testName' error='true' message='' details='java.lang.Exception|n']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFinished name='TestA.testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteFinished name='param']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteFinished name='TestA']\n", StringUtil.convertLineSeparators(buf.toString()));
     buf.setLength(0);
 
@@ -682,7 +683,7 @@ public class JUnitTreeByDescriptionHierarchyTest {
     sender.testRunFinished(new Result());
 
     Assert.assertEquals("output: " + buf, "##teamcity[rootName name = 'root' location = 'java:suite://root']\n" +
-                                          "\n" +
+
                                           "##teamcity[testIgnored name='TestA.testName' error='true' message='' details='java.lang.Exception|n']\n", StringUtil.convertLineSeparators(buf.toString()));
 
   }
@@ -739,49 +740,49 @@ public class JUnitTreeByDescriptionHierarchyTest {
     sender.testRunFinished(new Result());
 
     Assert.assertEquals("output: " + buf, "##teamcity[rootName name = 'root' location = 'java:suite://root']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteStarted name='Test0' locationHint='java:suite://Test0']\n" +
-                                          "\n" +
+
                                           "##teamcity[testStarted name='Test0.testName' locationHint='java:test://Test0/testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFinished name='Test0.testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteFinished name='Test0']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteStarted name='Test1' locationHint='java:suite://Test1']\n" +
-                                          "\n" +
+
                                           "##teamcity[testStarted name='Test1.testName' locationHint='java:test://Test1/testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testIgnored name='Test1.testName' error='true' message='' details='java.lang.Exception|n']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFinished name='Test1.testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteFinished name='Test1']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteStarted name='Test2' locationHint='java:suite://Test2']\n" +
-                                          "\n" +
+
                                           "##teamcity[testStarted name='Test2.testName' locationHint='java:test://Test2/testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFinished name='Test2.testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteFinished name='Test2']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteStarted name='Test3' locationHint='java:suite://Test3']\n" +
-                                          "\n" +
+
                                           "##teamcity[testStarted name='Test3.testName' locationHint='java:test://Test3/testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testIgnored name='Test3.testName' error='true' message='' details='java.lang.Exception|n']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFinished name='Test3.testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteFinished name='Test3']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteStarted name='Test4' locationHint='java:suite://Test4']\n" +
-                                          "\n" +
+
                                           "##teamcity[testStarted name='Test4.testName' locationHint='java:test://Test4/testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFinished name='Test4.testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteFinished name='Test4']\n", StringUtil.convertLineSeparators(buf.toString()));
   }
 
@@ -793,9 +794,9 @@ public class JUnitTreeByDescriptionHierarchyTest {
            "##teamcity[suiteTreeNode name='TestA.testName' locationHint='java:test://TestA/testName']\n" +
            "##teamcity[treeEnded]\n",
            "##teamcity[rootName name = 'TestA' location = 'java:suite://TestA']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='TestA.testName' locationHint='java:test://TestA/testName']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='TestA.testName']\n");
   }
 
@@ -822,21 +823,21 @@ public class JUnitTreeByDescriptionHierarchyTest {
     sender.testRunFinished(new Result());
 
     Assert.assertEquals("output: " + buf, "##teamcity[enteredTheMatrix]\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteStarted name='TestA' locationHint='java:suite://a.TestA']\n" +
-                                          "\n" +
+
                                           "##teamcity[testStarted name='TestA.testName' locationHint='java:test://a.TestA/testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFinished name='TestA.testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteFinished name='TestA']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteStarted name='TestB' locationHint='java:suite://a.TestB']\n" +
-                                          "\n" +
+
                                           "##teamcity[testStarted name='TestB.testName' locationHint='java:test://a.TestB/testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testFinished name='TestB.testName']\n" +
-                                          "\n" +
+
                                           "##teamcity[testSuiteFinished name='TestB']\n", StringUtil.convertLineSeparators(buf.toString()));
   }
 
@@ -880,17 +881,17 @@ public class JUnitTreeByDescriptionHierarchyTest {
 
 
            "##teamcity[rootName name = 'ATest' location = 'java:suite://ATest']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='testName' locationHint='java:suite://testName']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='ATest.testName|[0|]' locationHint='java:test://ATest/testName|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='ATest.testName|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='ATest.testName|[1|]' locationHint='java:test://ATest/testName|[1|]']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='ATest.testName|[1|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='testName']\n");
   }
 
@@ -927,37 +928,37 @@ public class JUnitTreeByDescriptionHierarchyTest {
 
            //start
            "##teamcity[rootName name = 'root' location = 'java:suite://root']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='ATest' locationHint='java:suite://ATest']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='|[0|]' locationHint='java:suite://ATest.|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='testName|[0|]' locationHint='java:test://ATest/testName|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='testName|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='|[0|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='|[1|]' locationHint='java:suite://ATest.|[1|]']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='testName|[1|]' locationHint='java:test://ATest/testName|[1|]']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='testName|[1|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='|[1|]']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='ATest']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='suite' locationHint='java:suite://suite']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='ATest' locationHint='java:suite://ATest']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='ATest.test' locationHint='java:test://ATest/test']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='ATest.test']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='ATest']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='suite']\n");
   }
 
@@ -990,13 +991,13 @@ public class JUnitTreeByDescriptionHierarchyTest {
            "##teamcity[treeEnded]\n",
 
            "##teamcity[rootName name = 'TestA' location = 'java:suite://TestA']\n" +
-           "\n" +
+
            "##teamcity[testSuiteStarted name='TestSuite$1' locationHint='java:suite://junit.framework.TestSuite$1']\n" +
-           "\n" +
+
            "##teamcity[testStarted name='TestSuite$1.warning' locationHint='java:test://junit.framework.TestSuite$1/warning']\n" +
-           "\n" +
+
            "##teamcity[testFinished name='TestSuite$1.warning']\n" +
-           "\n" +
+
            "##teamcity[testSuiteFinished name='TestSuite$1']\n");
   }
 }
diff --git a/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestListener.java b/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestListener.java
index bd58f89b1af2..b359827bd311 100644
--- a/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestListener.java
+++ b/plugins/junit_rt/src/com/intellij/junit4/JUnit4TestListener.java
@@ -85,7 +85,7 @@ public class JUnit4TestListener extends RunListener {
       for (int i = myStartedSuites.size() - 1; i>= 0; i--) {
         String className = JUnit4ReflectionUtil.getClassName((Description)myStartedSuites.get(i));
         if (!className.equals(myRootName)) {
-          myPrintStream.println("\n##teamcity[testSuiteFinished name=\'" + escapeName(getShortName(className)) + "\']");
+          myPrintStream.println("##teamcity[testSuiteFinished name=\'" + escapeName(getShortName(className)) + "\']");
         }
       }
       myStartedSuites.clear();
@@ -139,7 +139,7 @@ public class JUnit4TestListener extends RunListener {
 
     for (int i = myStartedSuites.size() - 1; i >= idx; i--) {
       currentClass = (Description)myStartedSuites.remove(i);
-      myPrintStream.println("\n##teamcity[testSuiteFinished name=\'" + escapeName(getShortName(JUnit4ReflectionUtil.getClassName(currentClass))) + "\']");
+      myPrintStream.println("##teamcity[testSuiteFinished name=\'" + escapeName(getShortName(JUnit4ReflectionUtil.getClassName(currentClass))) + "\']");
     }
 
     for (int i = idx; i < parentsHierarchy.size(); i++) {
@@ -147,12 +147,12 @@ public class JUnit4TestListener extends RunListener {
       final String fqName = JUnit4ReflectionUtil.getClassName(descriptionFromHistory);
       final String className = getShortName(fqName);
       if (!className.equals(myRootName)) {
-        myPrintStream.println("\n##teamcity[testSuiteStarted name=\'" + escapeName(className) + "\'" + getSuiteLocation(descriptionFromHistory, description, fqName) + "]");
+        myPrintStream.println("##teamcity[testSuiteStarted name=\'" + escapeName(className) + "\'" + getSuiteLocation(descriptionFromHistory, description, fqName) + "]");
       }
       myStartedSuites.add(descriptionFromHistory);
     }
 
-    myPrintStream.println("\n##teamcity[testStarted name=\'" + escapeName(methodName.replaceFirst("/", ".")) + "\' " + 
+    myPrintStream.println("##teamcity[testStarted name=\'" + escapeName(methodName.replaceFirst("/", ".")) + "\' " + 
                           getTestMethodLocation(methodName, classFQN) + "]");
     myCurrentTestStart = currentTime();
   }
@@ -200,7 +200,7 @@ public class JUnit4TestListener extends RunListener {
   private void testFinishedNoDumping(final String methodName) {
     if (methodName != null) {
       final long duration = currentTime() - myCurrentTestStart;
-      myPrintStream.println("\n##teamcity[testFinished name=\'" + escapeName(methodName.replaceFirst("/", ".")) +
+      myPrintStream.println("##teamcity[testFinished name=\'" + escapeName(methodName.replaceFirst("/", ".")) +
                             (duration > 0 ? "\' duration=\'" + duration : "") + "\']");
     }
     myCurrentTest = null;
@@ -240,7 +240,7 @@ public class JUnit4TestListener extends RunListener {
       return;
     }
 
-    myPrintStream.println("\n##teamcity[testFinished name=\'" + escapeName(CLASS_CONFIGURATION) + "\']");
+    myPrintStream.println("##teamcity[testFinished name=\'" + escapeName(CLASS_CONFIGURATION) + "\']");
     myCurrentTest = null;
   }
 
@@ -253,7 +253,7 @@ public class JUnit4TestListener extends RunListener {
     }
 
     myCurrentTest = description;
-    myPrintStream.println("\n##teamcity[testStarted name=\'" + escapeName(CLASS_CONFIGURATION) + "\'" + getSuiteLocation(JUnit4ReflectionUtil.getClassName(description)) + " ]");
+    myPrintStream.println("##teamcity[testStarted name=\'" + escapeName(CLASS_CONFIGURATION) + "\'" + getSuiteLocation(JUnit4ReflectionUtil.getClassName(description)) + " ]");
   }
 
   private void testFailure(Failure failure, Description description, String messageName, String methodName) {
@@ -290,7 +290,7 @@ public class JUnit4TestListener extends RunListener {
       ComparisonFailureData.registerSMAttributes(null, stringWriter.toString(), e.getMessage(), attrs, e);
     }
     finally {
-      myPrintStream.println("\n" + MapSerializerUtil.asString(messageName, attrs));
+      myPrintStream.println(MapSerializerUtil.asString(messageName, attrs));
     }
   }