diff --git a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/ChopDownIfLongMultipleLines.java b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/ChopDownIfLongMultipleLines.java
index 4a4fff2d1952..2b0788a87232 100644
--- a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/ChopDownIfLongMultipleLines.java
+++ b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/ChopDownIfLongMultipleLines.java
@@ -3,4 +3,7 @@ import java.time.Month;
 
 public class Main {
     private static final LocalDateTime localDateTime = LocalDateTime.of(2017, Month.NOVEMBER, 1, 2, 3);
+
+    public void foo(int longArgument1, int longArgument2, int longArgument3, int short4, int receiver1) {
+    }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/ChopDownIfLongMultipleLines_after.java b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/ChopDownIfLongMultipleLines_after.java
index ec039d15d572..1ec69ae04c34 100644
--- a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/ChopDownIfLongMultipleLines_after.java
+++ b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/ChopDownIfLongMultipleLines_after.java
@@ -8,4 +8,12 @@ public class Main {
             1,
             2,
             3);
+
+    public void foo(
+            int longArgument1,
+            int longArgument2,
+            int longArgument3,
+            int short4,
+            int receiver1) {
+    }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/ChopDownIfLongSingleLine.java b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/ChopDownIfLongSingleLine.java
index 4a4fff2d1952..da4fb40871fc 100644
--- a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/ChopDownIfLongSingleLine.java
+++ b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/ChopDownIfLongSingleLine.java
@@ -3,4 +3,6 @@ import java.time.Month;
 
 public class Main {
     private static final LocalDateTime localDateTime = LocalDateTime.of(2017, Month.NOVEMBER, 1, 2, 3);
+
+    public void foo(int longArgument1, int longArgument2, int longArgument3, int short4, int receiver1) {}
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/ChopDownIfLongSingleLine_after.java b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/ChopDownIfLongSingleLine_after.java
index 4a4fff2d1952..2b0788a87232 100644
--- a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/ChopDownIfLongSingleLine_after.java
+++ b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/ChopDownIfLongSingleLine_after.java
@@ -3,4 +3,7 @@ import java.time.Month;
 
 public class Main {
     private static final LocalDateTime localDateTime = LocalDateTime.of(2017, Month.NOVEMBER, 1, 2, 3);
+
+    public void foo(int longArgument1, int longArgument2, int longArgument3, int short4, int receiver1) {
+    }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/MultipleCalls.java b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/MultipleCalls.java
index 31f15b5cde6e..06fcda235c9b 100644
--- a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/MultipleCalls.java
+++ b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/MultipleCalls.java
@@ -15,4 +15,13 @@ public class Test {
     public void fooBarBaz(int... args) {
         fooBarBaz(100000, 100000, 100000, 100000, 100000, 100000, 100000, 100000, 100000, 100000, 100000, 100000, 100000);
     }
+
+    public void foo(int longArgument1, int longArgument2, int longArgument3, int short4, int receiver1) {
+    }
+
+    static void vertLongMethodName(int longArgument1, int longArgument2, int longArgument3, int short4) {
+    }
+
+    public <T, V extends Test> void typedMethod(@Deprecated List<? extends T> field1, @Deprecated List<? super T> field2) {
+    }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/MultipleCalls_after.java b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/MultipleCalls_after.java
index 64a5b8c233c3..7297de9ae3ad 100644
--- a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/MultipleCalls_after.java
+++ b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/MultipleCalls_after.java
@@ -41,4 +41,24 @@ public class Test {
                 100000,
                 100000);
     }
+
+    public void foo(
+            int longArgument1,
+            int longArgument2,
+            int longArgument3,
+            int short4,
+            int receiver1) {
+    }
+
+    static void vertLongMethodName(
+            int longArgument1,
+            int longArgument2,
+            int longArgument3,
+            int short4) {
+    }
+
+    public <T, V extends Test> void typedMethod(
+            @Deprecated List<? extends T> field1,
+            @Deprecated List<? super T> field2) {
+    }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/WrapAlways.java b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/WrapAlways.java
index 4a4fff2d1952..34a0fa0d5558 100644
--- a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/WrapAlways.java
+++ b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/WrapAlways.java
@@ -3,4 +3,7 @@ import java.time.Month;
 
 public class Main {
     private static final LocalDateTime localDateTime = LocalDateTime.of(2017, Month.NOVEMBER, 1, 2, 3);
+
+    public void foo(int longArgument1, int longArgument2, int longArgument3, int short4, int receiver1, int receiver3) {
+    }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/WrapAlways_after.java b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/WrapAlways_after.java
index ec039d15d572..4a8d0e5b5276 100644
--- a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/WrapAlways_after.java
+++ b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/WrapAlways_after.java
@@ -8,4 +8,13 @@ public class Main {
             1,
             2,
             3);
+
+    public void foo(
+            int longArgument1,
+            int longArgument2,
+            int longArgument3,
+            int short4,
+            int receiver1,
+            int receiver3) {
+    }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/WrapAsNeedSingleLine.java b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/WrapAsNeedSingleLine.java
index 4a4fff2d1952..2b0788a87232 100644
--- a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/WrapAsNeedSingleLine.java
+++ b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/WrapAsNeedSingleLine.java
@@ -3,4 +3,7 @@ import java.time.Month;
 
 public class Main {
     private static final LocalDateTime localDateTime = LocalDateTime.of(2017, Month.NOVEMBER, 1, 2, 3);
+
+    public void foo(int longArgument1, int longArgument2, int longArgument3, int short4, int receiver1) {
+    }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/WrapAsNeedSingleLine_after.java b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/WrapAsNeedSingleLine_after.java
index d6c28aced3bd..1dd897454518 100644
--- a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/WrapAsNeedSingleLine_after.java
+++ b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/WrapAsNeedSingleLine_after.java
@@ -4,4 +4,8 @@ import java.time.Month;
 public class Main {
     private static final LocalDateTime localDateTime = LocalDateTime.of(
             2017, Month.NOVEMBER, 1, 2, 3);
+
+    public void foo(
+            int longArgument1, int longArgument2, int longArgument3, int short4, int receiver1) {
+    }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/doNotWrap.java b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/doNotWrap.java
index 4a4fff2d1952..da4fb40871fc 100644
--- a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/doNotWrap.java
+++ b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/doNotWrap.java
@@ -3,4 +3,6 @@ import java.time.Month;
 
 public class Main {
     private static final LocalDateTime localDateTime = LocalDateTime.of(2017, Month.NOVEMBER, 1, 2, 3);
+
+    public void foo(int longArgument1, int longArgument2, int longArgument3, int short4, int receiver1) {}
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/doNotWrap_after.java b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/doNotWrap_after.java
index 4a4fff2d1952..2b0788a87232 100644
--- a/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/doNotWrap_after.java
+++ b/java/java-tests/testData/psi/formatter/java/newLineAfterLBrace/doNotWrap_after.java
@@ -3,4 +3,7 @@ import java.time.Month;
 
 public class Main {
     private static final LocalDateTime localDateTime = LocalDateTime.of(2017, Month.NOVEMBER, 1, 2, 3);
+
+    public void foo(int longArgument1, int longArgument2, int longArgument3, int short4, int receiver1) {
+    }
 }
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterNewLineAfterLBraceTest.kt b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterNewLineAfterLBraceTest.kt
index 98b3272c2f67..86a3201ee9eb 100644
--- a/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterNewLineAfterLBraceTest.kt
+++ b/java/java-tests/testSrc/com/intellij/java/psi/formatter/java/JavaFormatterNewLineAfterLBraceTest.kt
@@ -13,32 +13,33 @@ class JavaFormatterNewLineAfterLBraceTest : JavaFormatterTestCase() {
   override fun setUp() {
     super.setUp()
     commonSettings.CALL_PARAMETERS_LPAREN_ON_NEXT_LINE = true
+    commonSettings.METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE = true
     commonSettings.RIGHT_MARGIN = 100
   }
 
   fun testWrapAlways() {
-    commonSettings.CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_ALWAYS
+    setupWrapType(CommonCodeStyleSettings.WRAP_ALWAYS)
     doIdempotentTest()
   }
 
   fun testChopDownIfLongMultipleLines() {
-    commonSettings.CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_ON_EVERY_ITEM
+    setupWrapType(CommonCodeStyleSettings.WRAP_ON_EVERY_ITEM)
     doIdempotentTest()
   }
 
   fun testChopDownIfLongSingleLine() {
     commonSettings.RIGHT_MARGIN = 200
-    commonSettings.CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_ON_EVERY_ITEM
+    setupWrapType(CommonCodeStyleSettings.WRAP_ON_EVERY_ITEM)
     doIdempotentTest()
   }
 
   fun testDoNotWrap() {
-    commonSettings.CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.DO_NOT_WRAP
+    setupWrapType(CommonCodeStyleSettings.DO_NOT_WRAP)
     doTest()
   }
 
   fun testWrapAsNeedSingleLine() {
-    commonSettings.CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED
+    setupWrapType(CommonCodeStyleSettings.WRAP_AS_NEEDED)
     doIdempotentTest()
   }
 
@@ -48,7 +49,7 @@ class JavaFormatterNewLineAfterLBraceTest : JavaFormatterTestCase() {
   }
 
   fun testMultipleCalls() {
-    commonSettings.CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_ON_EVERY_ITEM
+    setupWrapType(CommonCodeStyleSettings.WRAP_ON_EVERY_ITEM)
     doIdempotentTest()
   }
 
@@ -57,4 +58,9 @@ class JavaFormatterNewLineAfterLBraceTest : JavaFormatterTestCase() {
     doTest(testName, "${testName}_after")
     doTest("${testName}_after", "${testName}_after")
   }
-}
\ No newline at end of file
+
+  private fun setupWrapType(wrapType: Int) {
+    commonSettings.CALL_PARAMETERS_WRAP = wrapType
+    commonSettings.METHOD_PARAMETERS_WRAP = wrapType
+  }
+}