diff --git a/python/src/com/jetbrains/python/codeInsight/editorActions/moveUpDown/StatementMover.java b/python/src/com/jetbrains/python/codeInsight/editorActions/moveUpDown/StatementMover.java
index 08879b0d222b..eb01b9900107 100644
--- a/python/src/com/jetbrains/python/codeInsight/editorActions/moveUpDown/StatementMover.java
+++ b/python/src/com/jetbrains/python/codeInsight/editorActions/moveUpDown/StatementMover.java
@@ -495,6 +495,9 @@ public class StatementMover extends LineMover {
       PyStatementList statementList = myStatementPartToRemovePass.getStatementList();
       if (statementList != null) {
         PyPsiUtils.removeRedundantPass(statementList);
+        final PsiElement whitespace = myStatementPartToRemovePass.getNextSibling();
+        if (whitespace instanceof PsiWhiteSpace)
+          whitespace.delete();
       }
     }
   }
diff --git a/python/testData/mover/removePass.py b/python/testData/mover/removePass.py
new file mode 100644
index 000000000000..e2e577bb5759
--- /dev/null
+++ b/python/testData/mover/removePass.py
@@ -0,0 +1,5 @@
+a = <caret>1      # <- move statement down here
+if True:
+    pass
+else:
+    b = 2
\ No newline at end of file
diff --git a/python/testData/mover/removePass_afterDown.py b/python/testData/mover/removePass_afterDown.py
new file mode 100644
index 000000000000..802fa82e459e
--- /dev/null
+++ b/python/testData/mover/removePass_afterDown.py
@@ -0,0 +1,4 @@
+if True:
+    a = 1      # <- move statement down here
+else:
+    b = 2
\ No newline at end of file
diff --git a/python/testData/mover/removePass_afterUp.py b/python/testData/mover/removePass_afterUp.py
new file mode 100644
index 000000000000..1b19556d5c95
--- /dev/null
+++ b/python/testData/mover/removePass_afterUp.py
@@ -0,0 +1,5 @@
+a = 1      # <- move statement down here
+if True:
+    pass
+else:
+    b = 2
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/PyStatementMoverTest.java b/python/testSrc/com/jetbrains/python/PyStatementMoverTest.java
index c633d21e389d..4ff89028390d 100644
--- a/python/testSrc/com/jetbrains/python/PyStatementMoverTest.java
+++ b/python/testSrc/com/jetbrains/python/PyStatementMoverTest.java
@@ -173,6 +173,10 @@ public class PyStatementMoverTest extends PyTestCase {
     doTest();
   }
 
+  public void testRemovePass() { // PY-6282
+    doTest();
+  }
+
   public void testWith() { // PY-5202
     try {
       setLanguageLevel(LanguageLevel.PYTHON27);