diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 68aa9fcc268..c22a3680c5b 100644
--- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -57,7 +57,6 @@ import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractKeywordComplet
 import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractSmartCompletionHandlerTest
 import org.jetbrains.kotlin.idea.completion.test.weighers.AbstractBasicCompletionWeigherTest
 import org.jetbrains.kotlin.idea.completion.test.weighers.AbstractSmartCompletionWeigherTest
-import org.jetbrains.kotlin.idea.maven.configuration.AbstractMavenConfigureProjectByChangingFileTest
 import org.jetbrains.kotlin.idea.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest
 import org.jetbrains.kotlin.idea.coverage.AbstractKotlinCoverageOutputFilesTest
 import org.jetbrains.kotlin.idea.debugger.AbstractBeforeExtractFunctionInsertionTest
@@ -86,6 +85,7 @@ import org.jetbrains.kotlin.idea.internal.AbstractBytecodeToolWindowTest
 import org.jetbrains.kotlin.idea.kdoc.AbstractKDocHighlightingTest
 import org.jetbrains.kotlin.idea.kdoc.AbstractKDocTypingTest
 import org.jetbrains.kotlin.idea.maven.AbstractKotlinMavenInspectionTest
+import org.jetbrains.kotlin.idea.maven.configuration.AbstractMavenConfigureProjectByChangingFileTest
 import org.jetbrains.kotlin.idea.navigation.AbstractGotoSuperTest
 import org.jetbrains.kotlin.idea.navigation.AbstractKotlinGotoImplementationTest
 import org.jetbrains.kotlin.idea.navigation.AbstractKotlinGotoTest
@@ -508,6 +508,7 @@ fun main(args: Array<String>) {
             model("codeInsight/moveUpDown/classBodyDeclarations", testMethod = "doTestClassBodyDeclaration")
             model("codeInsight/moveUpDown/closingBraces", testMethod = "doTestExpression")
             model("codeInsight/moveUpDown/expressions", testMethod = "doTestExpression")
+            model("codeInsight/moveUpDown/parametersAndArguments", testMethod = "doTestExpression")
         }
 
         testClass<AbstractInlineTest>() {
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt
index 643b540f831..ddcdf0afd8c 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt
@@ -1,5 +1,4 @@
 // MOVE: down
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 val x = foo(
         <caret>a,
         b,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt.after
index 70c2b241578..70201d6d48a 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt.after
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt.after
@@ -1,5 +1,4 @@
 // MOVE: down
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 val x = foo(
         b,
         <caret>a,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt
index 70c2b241578..70201d6d48a 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt
@@ -1,5 +1,4 @@
 // MOVE: down
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 val x = foo(
         b,
         <caret>a,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt.after
index ecb2fffdf8b..6d8e166a156 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt.after
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt.after
@@ -1,5 +1,4 @@
 // MOVE: down
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 val x = foo(
         b,
         c,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs3.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs3.kt
index f754c5b3f47..028e21e122e 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs3.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs3.kt
@@ -1,5 +1,4 @@
 // MOVE: down
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 // IS_APPLICABLE: false
 val x = foo(
         b,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt
index a1d854d3b34..cf2f424f93b 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt
@@ -1,5 +1,4 @@
 // MOVE: up
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 val x = foo(
         b,
         c,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt.after
index 83146472e6b..29979bbb2dc 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt.after
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt.after
@@ -1,5 +1,4 @@
 // MOVE: up
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 val x = foo(
         b,
         <caret>a,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt
index 83146472e6b..29979bbb2dc 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt
@@ -1,5 +1,4 @@
 // MOVE: up
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 val x = foo(
         b,
         <caret>a,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt.after
index 930a82583d6..5f9224a9457 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt.after
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt.after
@@ -1,5 +1,4 @@
 // MOVE: up
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 val x = foo(
         <caret>a,
         b,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs6.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs6.kt
index 6277a08172a..b0028df60df 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs6.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs6.kt
@@ -1,5 +1,4 @@
 // MOVE: up
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 // IS_APPLICABLE: false
 val x = foo(
         <caret>a,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams1.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams1.kt
index 61a97be7946..71e5ab08e76 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams1.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams1.kt
@@ -1,5 +1,4 @@
 // MOVE: down
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 class A(
         b:<caret> Int,
         a: Int,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams1.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams1.kt.after
index a9ab7563a61..49a43007d62 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams1.kt.after
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams1.kt.after
@@ -1,5 +1,4 @@
 // MOVE: down
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 class A(
         a: Int,
         b:<caret> Int,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams2.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams2.kt
index a11d5ade49d..ba0ac9989db 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams2.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams2.kt
@@ -1,5 +1,4 @@
 // MOVE: down
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 class A(
         b: Int,
         <caret>a: Int,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams2.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams2.kt.after
index c6a85089b9a..03282e20760 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams2.kt.after
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams2.kt.after
@@ -1,5 +1,4 @@
 // MOVE: down
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 class A(
         b: Int,
         c: Int,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt
index 65ef1146fd0..b8e9b5eedff 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt
@@ -1,5 +1,4 @@
 // MOVE: up
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 class A(
         a: Int,
         b:<caret> Int,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt.after
index 7f47f3b2050..68195d03734 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt.after
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt.after
@@ -1,5 +1,4 @@
 // MOVE: up
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 class A(
         b:<caret> Int,
         a: Int,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams4.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams4.kt
index d1a52e89b76..c0eba1b29cf 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams4.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams4.kt
@@ -1,5 +1,4 @@
 // MOVE: up
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 class A(
         b: Int,
         c: Int,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams4.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams4.kt.after
index 85c887020f7..9f8d15ff105 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams4.kt.after
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams4.kt.after
@@ -1,5 +1,4 @@
 // MOVE: up
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 class A(
         b: Int,
         <caret>a: Int,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams5.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams5.kt
index d17e57846da..dd757fdff72 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams5.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams5.kt
@@ -1,5 +1,4 @@
 // MOVE: down
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 // IS_APPLICABLE: false
 class A(
         b: Int,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams6.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams6.kt
index c70c01355c5..418e5b662ba 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams6.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams6.kt
@@ -1,5 +1,4 @@
 // MOVE: up
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 // IS_APPLICABLE: false
 class A(
         <caret>b: Int,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt
index fa594046e3e..60e5b97d227 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt
@@ -1,5 +1,4 @@
 // MOVE: down
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 class A {
     fun foo<T,
             U,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt.after
index 18aaa89b893..531a44c072d 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt.after
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt.after
@@ -1,5 +1,4 @@
 // MOVE: down
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 class A {
     fun foo<T,
             U,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt
index 514e0d96f7d..205d73a9464 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt
@@ -1,5 +1,4 @@
 // MOVE: down
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 class A {
     fun foo<T,
             U,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt.after
index a0635b896a2..2ef442f4b5a 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt.after
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt.after
@@ -1,5 +1,4 @@
 // MOVE: down
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 class A {
     fun foo<T,
             U,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt
index 2f8a51f31fb..69c0c137b69 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt
@@ -1,5 +1,4 @@
 // MOVE: up
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 class A {
     fun foo<T,
             U,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt.after
index 2a83fc125d9..eec35aab54e 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt.after
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt.after
@@ -1,5 +1,4 @@
 // MOVE: up
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 class A {
     fun foo<T,
             U,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt
index 894a31bcc68..36c6660a3a3 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt
@@ -1,5 +1,4 @@
 // MOVE: up
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 class A {
     fun foo<T,
             U,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt.after b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt.after
index 01df3956809..55efd6fb3f1 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt.after
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt.after
@@ -1,5 +1,4 @@
 // MOVE: up
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 class A {
     fun foo<T,
             U,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams5.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams5.kt
index 8d4c4c9ef77..d2658f779af 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams5.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams5.kt
@@ -1,5 +1,4 @@
 // MOVE: down
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 // IS_APPLICABLE: false
 class A {
     fun foo<T,
diff --git a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams6.kt b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams6.kt
index e9da732d4eb..1944a7fc433 100644
--- a/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams6.kt
+++ b/idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams6.kt
@@ -1,5 +1,4 @@
 // MOVE: up
-// MOVER_CLASS: org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover
 // IS_APPLICABLE: false
 class A {
     fun foo<T,
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt
index 8ab4b97df0a..3f311d8581a 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.kt
@@ -41,7 +41,7 @@ abstract class AbstractCodeMoverTest : LightCodeInsightTestCase() {
         doTest(path, KotlinExpressionMover::class.java)
     }
 
-    private fun doTest(path: String, defaultMoverClass: Class<out StatementUpDownMover>) {
+    private fun doTest(path: String, moverClass: Class<out StatementUpDownMover>) {
         configureByFile(path)
 
         val fileText = FileUtil.loadFile(File(path), true)
@@ -71,13 +71,8 @@ abstract class AbstractCodeMoverTest : LightCodeInsightTestCase() {
             }
         }
 
-        var moverClassName = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// MOVER_CLASS: ")
-        if (moverClassName == null) {
-            moverClassName = defaultMoverClass.name
-        }
-
         assertTrue("No mover found", actualMover != null)
-        assertEquals("Unmatched movers", moverClassName, actualMover!!.javaClass.name)
+        assertEquals("Unmatched movers", moverClass.name, actualMover!!.javaClass.name)
         assertEquals("Invalid applicability", isApplicableExpected, info.toMove2 != null)
 
         if (isApplicableExpected) {
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 ae9cee61206..b8eefe1fb60 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/CodeMoverTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/CodeMoverTestGenerated.java
@@ -1225,4 +1225,121 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
             doTestExpression(fileName);
         }
     }
+
+    @TestMetadata("idea/testData/codeInsight/moveUpDown/parametersAndArguments")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class ParametersAndArguments extends AbstractCodeMoverTest {
+        public void testAllFilesPresentInParametersAndArguments() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/parametersAndArguments"), Pattern.compile("^(.+)\\.kt$"), true);
+        }
+
+        @TestMetadata("callArgs1.kt")
+        public void testCallArgs1() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs1.kt");
+            doTestExpression(fileName);
+        }
+
+        @TestMetadata("callArgs2.kt")
+        public void testCallArgs2() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs2.kt");
+            doTestExpression(fileName);
+        }
+
+        @TestMetadata("callArgs3.kt")
+        public void testCallArgs3() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs3.kt");
+            doTestExpression(fileName);
+        }
+
+        @TestMetadata("callArgs4.kt")
+        public void testCallArgs4() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs4.kt");
+            doTestExpression(fileName);
+        }
+
+        @TestMetadata("callArgs5.kt")
+        public void testCallArgs5() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs5.kt");
+            doTestExpression(fileName);
+        }
+
+        @TestMetadata("callArgs6.kt")
+        public void testCallArgs6() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/parametersAndArguments/callArgs6.kt");
+            doTestExpression(fileName);
+        }
+
+        @TestMetadata("classParams1.kt")
+        public void testClassParams1() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams1.kt");
+            doTestExpression(fileName);
+        }
+
+        @TestMetadata("classParams2.kt")
+        public void testClassParams2() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams2.kt");
+            doTestExpression(fileName);
+        }
+
+        @TestMetadata("classParams3.kt")
+        public void testClassParams3() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams3.kt");
+            doTestExpression(fileName);
+        }
+
+        @TestMetadata("classParams4.kt")
+        public void testClassParams4() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams4.kt");
+            doTestExpression(fileName);
+        }
+
+        @TestMetadata("classParams5.kt")
+        public void testClassParams5() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams5.kt");
+            doTestExpression(fileName);
+        }
+
+        @TestMetadata("classParams6.kt")
+        public void testClassParams6() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/parametersAndArguments/classParams6.kt");
+            doTestExpression(fileName);
+        }
+
+        @TestMetadata("funParams1.kt")
+        public void testFunParams1() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams1.kt");
+            doTestExpression(fileName);
+        }
+
+        @TestMetadata("funParams2.kt")
+        public void testFunParams2() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams2.kt");
+            doTestExpression(fileName);
+        }
+
+        @TestMetadata("funParams3.kt")
+        public void testFunParams3() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams3.kt");
+            doTestExpression(fileName);
+        }
+
+        @TestMetadata("funParams4.kt")
+        public void testFunParams4() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams4.kt");
+            doTestExpression(fileName);
+        }
+
+        @TestMetadata("funParams5.kt")
+        public void testFunParams5() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams5.kt");
+            doTestExpression(fileName);
+        }
+
+        @TestMetadata("funParams6.kt")
+        public void testFunParams6() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/codeInsight/moveUpDown/parametersAndArguments/funParams6.kt");
+            doTestExpression(fileName);
+        }
+    }
 }