diff --git a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/ShorterFirst.kt b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/ShorterFirst.kt
new file mode 100644
index 00000000000..3cc36b59436
--- /dev/null
+++ b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/ShorterFirst.kt
@@ -0,0 +1,7 @@
+class MyFile
+class MyFileStream
+
+fun foo(myFi<caret>)
+
+// ORDER: myFile
+// ORDER: myFileStream
diff --git a/idea/idea-completion/testData/weighers/basic/parameterNameAndType/StartMatchFirst.kt b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/StartMatchFirst.kt
new file mode 100644
index 00000000000..79d4574048b
--- /dev/null
+++ b/idea/idea-completion/testData/weighers/basic/parameterNameAndType/StartMatchFirst.kt
@@ -0,0 +1,7 @@
+class FooBar
+class FaOaOa
+
+fun foo(foo<caret>)
+
+// ORDER: fooBar
+// ORDER: faOaOa
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/BasicCompletionWeigherTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/BasicCompletionWeigherTestGenerated.java
index 24099241723..9f990ce282c 100644
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/BasicCompletionWeigherTestGenerated.java
+++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/weighers/BasicCompletionWeigherTestGenerated.java
@@ -150,5 +150,17 @@ public class BasicCompletionWeigherTestGenerated extends AbstractBasicCompletion
             String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/ImportedFirst.kt");
             doTest(fileName);
         }
+
+        @TestMetadata("ShorterFirst.kt")
+        public void testShorterFirst() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/ShorterFirst.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("StartMatchFirst.kt")
+        public void testStartMatchFirst() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("idea/idea-completion/testData/weighers/basic/parameterNameAndType/StartMatchFirst.kt");
+            doTest(fileName);
+        }
     }
 }