diff --git a/platform/platform-tests/testSrc/com/intellij/execution/GeneralCommandLineTest.java b/platform/platform-tests/testSrc/com/intellij/execution/GeneralCommandLineTest.java
index 8d6f264a1b78..f87c889a88ce 100644
--- a/platform/platform-tests/testSrc/com/intellij/execution/GeneralCommandLineTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/execution/GeneralCommandLineTest.java
@@ -291,7 +291,7 @@ public class GeneralCommandLineTest {
       if (argument.trim().isEmpty()) continue;  // would report "ECHO is on"
       GeneralCommandLine commandLine = createCommandLine(ExecUtil.getWindowsShellName(), "/D", "/C", "echo", argument);
       String output = execAndGetOutput(commandLine);
-      assertEquals(commandLine.getPreparedCommandLine(), argument + "\n", output);
+      assertEquals(commandLine.getPreparedCommandLine(), filterExpectedOutput(argument) + "\n", output);
     }
   }
 
@@ -305,7 +305,7 @@ public class GeneralCommandLineTest {
     for (String argument : ARGUMENTS) {
       GeneralCommandLine commandLine = createCommandLine(cygwinPrintf.getPath(), "[%s]\\\\n", argument);
       String output = execAndGetOutput(commandLine);
-      assertEquals(commandLine.getPreparedCommandLine(), filterExpectedOutput("[" + argument + "]\n"), output);
+      assertEquals(commandLine.getPreparedCommandLine(), filterExpectedOutput("[" + argument + "]") + "\n", output);
     }
   }
 
diff --git a/platform/platform-tests/testSrc/com/intellij/execution/PtyCommandLineTest.java b/platform/platform-tests/testSrc/com/intellij/execution/PtyCommandLineTest.java
index 2b270deb21b7..f728e9715857 100644
--- a/platform/platform-tests/testSrc/com/intellij/execution/PtyCommandLineTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/execution/PtyCommandLineTest.java
@@ -32,7 +32,7 @@ public class PtyCommandLineTest extends GeneralCommandLineTest {
   @NotNull
   @Override
   protected String filterExpectedOutput(@NotNull String output) {
-    if (SystemInfo.isWindows) output = expandTabs(output, 8);
+    if (SystemInfo.isWindows) output = StringUtil.trimTrailing(expandTabs(output, 8));
     return output;
   }