diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetDeclarationMover.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetDeclarationMover.java
index eb6cc30ee5b..67eaaba3583 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetDeclarationMover.java
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetDeclarationMover.java
@@ -109,6 +109,7 @@ public class JetDeclarationMover extends AbstractJetUpDownMover {
         if (element == null) return null;
 
         JetDeclaration declaration = PsiTreeUtil.getParentOfType(element, JetDeclaration.class, false);
+        if (declaration instanceof JetParameter) return null;
         if (declaration instanceof JetTypeParameter) {
             return getMovableDeclaration(declaration.getParent());
         }
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs1.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt
similarity index 100%
rename from idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs1.kt
rename to idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs1.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt.after
similarity index 100%
rename from idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs1.kt.after
rename to idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt.after
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs2.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt
similarity index 100%
rename from idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs2.kt
rename to idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs2.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt.after
similarity index 100%
rename from idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs2.kt.after
rename to idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt.after
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs3.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs3.kt
similarity index 100%
rename from idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs3.kt
rename to idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs3.kt
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs4.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt
similarity index 100%
rename from idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs4.kt
rename to idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs4.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt.after
similarity index 100%
rename from idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs4.kt.after
rename to idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt.after
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs5.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt
similarity index 100%
rename from idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs5.kt
rename to idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs5.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt.after
similarity index 100%
rename from idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs5.kt.after
rename to idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt.after
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs6.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs6.kt
similarity index 100%
rename from idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs6.kt
rename to idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs6.kt
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams1.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams1.kt
new file mode 100644
index 00000000000..61a97be7946
--- /dev/null
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams1.kt
@@ -0,0 +1,9 @@
+// MOVE: down
+// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
+class A(
+        b:<caret> Int,
+        a: Int,
+        c: Int
+) {
+
+}
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams1.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams1.kt.after
new file mode 100644
index 00000000000..a9ab7563a61
--- /dev/null
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams1.kt.after
@@ -0,0 +1,9 @@
+// MOVE: down
+// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
+class A(
+        a: Int,
+        b:<caret> Int,
+        c: Int
+) {
+
+}
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams2.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams2.kt
new file mode 100644
index 00000000000..a11d5ade49d
--- /dev/null
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams2.kt
@@ -0,0 +1,9 @@
+// MOVE: down
+// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
+class A(
+        b: Int,
+        <caret>a: Int,
+        c: Int
+) {
+
+}
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams2.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams2.kt.after
new file mode 100644
index 00000000000..c6a85089b9a
--- /dev/null
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams2.kt.after
@@ -0,0 +1,9 @@
+// MOVE: down
+// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
+class A(
+        b: Int,
+        c: Int,
+        <caret>a: Int
+) {
+
+}
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt
new file mode 100644
index 00000000000..65ef1146fd0
--- /dev/null
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt
@@ -0,0 +1,9 @@
+// MOVE: up
+// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
+class A(
+        a: Int,
+        b:<caret> Int,
+        c: Int
+) {
+
+}
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt.after
new file mode 100644
index 00000000000..7f47f3b2050
--- /dev/null
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt.after
@@ -0,0 +1,9 @@
+// MOVE: up
+// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
+class A(
+        b:<caret> Int,
+        a: Int,
+        c: Int
+) {
+
+}
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams4.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams4.kt
new file mode 100644
index 00000000000..d1a52e89b76
--- /dev/null
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams4.kt
@@ -0,0 +1,9 @@
+// MOVE: up
+// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
+class A(
+        b: Int,
+        c: Int,
+        <caret>a: Int
+) {
+
+}
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams4.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams4.kt.after
new file mode 100644
index 00000000000..85c887020f7
--- /dev/null
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams4.kt.after
@@ -0,0 +1,9 @@
+// MOVE: up
+// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
+class A(
+        b: Int,
+        <caret>a: Int,
+        c: Int
+) {
+
+}
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams5.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams5.kt
new file mode 100644
index 00000000000..d17e57846da
--- /dev/null
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams5.kt
@@ -0,0 +1,10 @@
+// MOVE: down
+// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
+// IS_APPLICABLE: false
+class A(
+        b: Int,
+        c: Int,
+        <caret>a: Int
+) {
+
+}
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams6.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams6.kt
new file mode 100644
index 00000000000..c70c01355c5
--- /dev/null
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams6.kt
@@ -0,0 +1,10 @@
+// MOVE: up
+// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
+// IS_APPLICABLE: false
+class A(
+        <caret>b: Int,
+        c: Int,
+        a: Int
+) {
+
+}
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams1.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt
similarity index 100%
rename from idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams1.kt
rename to idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams1.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt.after
similarity index 100%
rename from idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams1.kt.after
rename to idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt.after
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams2.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt
similarity index 100%
rename from idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams2.kt
rename to idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams2.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt.after
similarity index 100%
rename from idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams2.kt.after
rename to idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt.after
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams3.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt
similarity index 100%
rename from idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams3.kt
rename to idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams3.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt.after
similarity index 100%
rename from idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams3.kt.after
rename to idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt.after
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams4.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt
similarity index 100%
rename from idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams4.kt
rename to idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams4.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt.after
similarity index 100%
rename from idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams4.kt.after
rename to idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt.after
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams5.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams5.kt
similarity index 100%
rename from idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams5.kt
rename to idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams5.kt
diff --git a/idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams6.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams6.kt
similarity index 100%
rename from idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams6.kt
rename to idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams6.kt
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/CodeMoverTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/CodeMoverTestGenerated.java
index 91c1e065b94..365939f4b9b 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/CodeMoverTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/CodeMoverTestGenerated.java
@@ -476,78 +476,6 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
                 String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/typeParams3.kt");
                 doTestClassBodyDeclaration(fileName);
             }
-
-            @TestMetadata("valueArgs1.kt")
-            public void testValueArgs1() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs1.kt");
-                doTestClassBodyDeclaration(fileName);
-            }
-
-            @TestMetadata("valueArgs2.kt")
-            public void testValueArgs2() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs2.kt");
-                doTestClassBodyDeclaration(fileName);
-            }
-
-            @TestMetadata("valueArgs3.kt")
-            public void testValueArgs3() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs3.kt");
-                doTestClassBodyDeclaration(fileName);
-            }
-
-            @TestMetadata("valueArgs4.kt")
-            public void testValueArgs4() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs4.kt");
-                doTestClassBodyDeclaration(fileName);
-            }
-
-            @TestMetadata("valueArgs5.kt")
-            public void testValueArgs5() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs5.kt");
-                doTestClassBodyDeclaration(fileName);
-            }
-
-            @TestMetadata("valueArgs6.kt")
-            public void testValueArgs6() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueArgs6.kt");
-                doTestClassBodyDeclaration(fileName);
-            }
-
-            @TestMetadata("valueParams1.kt")
-            public void testValueParams1() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams1.kt");
-                doTestClassBodyDeclaration(fileName);
-            }
-
-            @TestMetadata("valueParams2.kt")
-            public void testValueParams2() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams2.kt");
-                doTestClassBodyDeclaration(fileName);
-            }
-
-            @TestMetadata("valueParams3.kt")
-            public void testValueParams3() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams3.kt");
-                doTestClassBodyDeclaration(fileName);
-            }
-
-            @TestMetadata("valueParams4.kt")
-            public void testValueParams4() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams4.kt");
-                doTestClassBodyDeclaration(fileName);
-            }
-
-            @TestMetadata("valueParams5.kt")
-            public void testValueParams5() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams5.kt");
-                doTestClassBodyDeclaration(fileName);
-            }
-
-            @TestMetadata("valueParams6.kt")
-            public void testValueParams6() throws Exception {
-                String fileName = JetTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors/valueParams6.kt");
-                doTestClassBodyDeclaration(fileName);
-            }
         }
 
         @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property")