diff --git a/python/testSrc/com/jetbrains/env/python/PythonConsoleTest.java b/python/testSrc/com/jetbrains/env/python/PythonConsoleTest.java
index 6deaf67bed2b..86fbcb21b716 100644
--- a/python/testSrc/com/jetbrains/env/python/PythonConsoleTest.java
+++ b/python/testSrc/com/jetbrains/env/python/PythonConsoleTest.java
@@ -39,7 +39,7 @@ public class PythonConsoleTest extends PyEnvTestCase {
       @Override
       public void testing() throws Exception {
         exec("if True:\n" +
-             "        x=1\n" +
+             "  x=1\n" +
              "y=x+100\n" +
              "for i in range(1):\n" +
              "  print(y)\n");
@@ -86,10 +86,8 @@ public class PythonConsoleTest extends PyEnvTestCase {
       public void testing() throws Exception {
         exec("x = 96");
         exec("x +=1");
-        exec("if True:");
-        exec("  print(x)");
-        exec("");
-        exec("");
+        exec("if True:\n" +
+             "  print(x)\n");
         waitForOutput("97");
       }
     });
diff --git a/python/testSrc/com/jetbrains/env/python/console/PyConsoleTask.java b/python/testSrc/com/jetbrains/env/python/console/PyConsoleTask.java
index b1c2e4c34c94..934538d7a91e 100644
--- a/python/testSrc/com/jetbrains/env/python/console/PyConsoleTask.java
+++ b/python/testSrc/com/jetbrains/env/python/console/PyConsoleTask.java
@@ -324,6 +324,9 @@ public class PyConsoleTask extends PyExecutionFixtureTestTask {
         myConsoleView.executeInConsole(command);
       }
     });
+    Assert.assertTrue(String.format("Command execution wasn't finished: `%s` \n" +
+                                    "Output: %s", command, output()), waitFor(myCommandSemaphore));
+    myCommandSemaphore.release();
   }
 
   protected boolean hasValue(String varName, String value) throws PyDebuggerException {