diff --git a/idea/idea-fir/tests/org/jetbrains/kotlin/shortenRefs/FirShortenRefsTestGenerated.java b/idea/idea-fir/tests/org/jetbrains/kotlin/shortenRefs/FirShortenRefsTestGenerated.java
index d5faf9eeaa3..9d091b804e9 100644
--- a/idea/idea-fir/tests/org/jetbrains/kotlin/shortenRefs/FirShortenRefsTestGenerated.java
+++ b/idea/idea-fir/tests/org/jetbrains/kotlin/shortenRefs/FirShortenRefsTestGenerated.java
@@ -56,9 +56,39 @@ public class FirShortenRefsTestGenerated extends AbstractFirShortenRefsTest {
             runTest("idea/testData/shortenRefsFir/types/ParameterTypeGenericTypes.kt");
         }
 
+        @TestMetadata("ParameterTypeImportedTypeWins.kt")
+        public void testParameterTypeImportedTypeWins() throws Exception {
+            runTest("idea/testData/shortenRefsFir/types/ParameterTypeImportedTypeWins.kt");
+        }
+
         @TestMetadata("ParameterTypeNestedType.kt")
         public void testParameterTypeNestedType() throws Exception {
             runTest("idea/testData/shortenRefsFir/types/ParameterTypeNestedType.kt");
         }
+
+        @TestMetadata("ParameterTypeStarImportedTypeLoses.kt")
+        public void testParameterTypeStarImportedTypeLoses() throws Exception {
+            runTest("idea/testData/shortenRefsFir/types/ParameterTypeStarImportedTypeLoses.kt");
+        }
+
+        @TestMetadata("ParameterTypeTopLevelTypeLoses.kt")
+        public void testParameterTypeTopLevelTypeLoses() throws Exception {
+            runTest("idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeLoses.kt");
+        }
+
+        @TestMetadata("ParameterTypeTopLevelTypeWins.kt")
+        public void testParameterTypeTopLevelTypeWins() throws Exception {
+            runTest("idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeWins.kt");
+        }
+
+        @TestMetadata("VariableType.kt")
+        public void testVariableType() throws Exception {
+            runTest("idea/testData/shortenRefsFir/types/VariableType.kt");
+        }
+
+        @TestMetadata("VariableTypeConflictWithLocalType.kt")
+        public void testVariableTypeConflictWithLocalType() throws Exception {
+            runTest("idea/testData/shortenRefsFir/types/VariableTypeConflictWithLocalType.kt");
+        }
     }
 }
diff --git a/idea/testData/shortenRefsFir/types/ParameterTypeImportedTypeWins.dependency.kt b/idea/testData/shortenRefsFir/types/ParameterTypeImportedTypeWins.dependency.kt
new file mode 100644
index 00000000000..fc6fb4fa1c8
--- /dev/null
+++ b/idea/testData/shortenRefsFir/types/ParameterTypeImportedTypeWins.dependency.kt
@@ -0,0 +1,3 @@
+package dependency
+
+class T
\ No newline at end of file
diff --git a/idea/testData/shortenRefsFir/types/ParameterTypeImportedTypeWins.kt b/idea/testData/shortenRefsFir/types/ParameterTypeImportedTypeWins.kt
new file mode 100644
index 00000000000..fef88d3c273
--- /dev/null
+++ b/idea/testData/shortenRefsFir/types/ParameterTypeImportedTypeWins.kt
@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+import dependency.T
+
+class T
+
+<selection>fun foo(t: dependency.T) {}</selection>
\ No newline at end of file
diff --git a/idea/testData/shortenRefsFir/types/ParameterTypeImportedTypeWins.kt.after b/idea/testData/shortenRefsFir/types/ParameterTypeImportedTypeWins.kt.after
new file mode 100644
index 00000000000..cc3c98b90a6
--- /dev/null
+++ b/idea/testData/shortenRefsFir/types/ParameterTypeImportedTypeWins.kt.after
@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+import dependency.T
+
+class T
+
+fun foo(t: T) {}
\ No newline at end of file
diff --git a/idea/testData/shortenRefsFir/types/ParameterTypeStarImportedTypeLoses.dependency.kt b/idea/testData/shortenRefsFir/types/ParameterTypeStarImportedTypeLoses.dependency.kt
new file mode 100644
index 00000000000..fc6fb4fa1c8
--- /dev/null
+++ b/idea/testData/shortenRefsFir/types/ParameterTypeStarImportedTypeLoses.dependency.kt
@@ -0,0 +1,3 @@
+package dependency
+
+class T
\ No newline at end of file
diff --git a/idea/testData/shortenRefsFir/types/ParameterTypeStarImportedTypeLoses.kt b/idea/testData/shortenRefsFir/types/ParameterTypeStarImportedTypeLoses.kt
new file mode 100644
index 00000000000..9ce3da4005b
--- /dev/null
+++ b/idea/testData/shortenRefsFir/types/ParameterTypeStarImportedTypeLoses.kt
@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+import dependency.*
+
+class T
+
+<selection>fun foo(t: dependency.T) {}</selection>
\ No newline at end of file
diff --git a/idea/testData/shortenRefsFir/types/ParameterTypeStarImportedTypeLoses.kt.after b/idea/testData/shortenRefsFir/types/ParameterTypeStarImportedTypeLoses.kt.after
new file mode 100644
index 00000000000..bcab9592b0e
--- /dev/null
+++ b/idea/testData/shortenRefsFir/types/ParameterTypeStarImportedTypeLoses.kt.after
@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+import dependency.*
+
+class T
+
+fun foo(t: dependency.T) {}
\ No newline at end of file
diff --git a/idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeLoses.dependency.kt b/idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeLoses.dependency.kt
new file mode 100644
index 00000000000..fc6fb4fa1c8
--- /dev/null
+++ b/idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeLoses.dependency.kt
@@ -0,0 +1,3 @@
+package dependency
+
+class T
\ No newline at end of file
diff --git a/idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeLoses.kt b/idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeLoses.kt
new file mode 100644
index 00000000000..7191b444a4e
--- /dev/null
+++ b/idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeLoses.kt
@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+import dependency.T
+
+class T
+
+<selection>fun foo(t: test.T) {}</selection>
\ No newline at end of file
diff --git a/idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeLoses.kt.after b/idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeLoses.kt.after
new file mode 100644
index 00000000000..95f47a3ea80
--- /dev/null
+++ b/idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeLoses.kt.after
@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+import dependency.T
+
+class T
+
+fun foo(t: test.T) {}
\ No newline at end of file
diff --git a/idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeWins.dependency.kt b/idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeWins.dependency.kt
new file mode 100644
index 00000000000..fc6fb4fa1c8
--- /dev/null
+++ b/idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeWins.dependency.kt
@@ -0,0 +1,3 @@
+package dependency
+
+class T
\ No newline at end of file
diff --git a/idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeWins.kt b/idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeWins.kt
new file mode 100644
index 00000000000..afadcdce90a
--- /dev/null
+++ b/idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeWins.kt
@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+import dependency.*
+
+class T
+
+<selection>fun foo(t: test.T) {}</selection>
\ No newline at end of file
diff --git a/idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeWins.kt.after b/idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeWins.kt.after
new file mode 100644
index 00000000000..77a9b2d7cb1
--- /dev/null
+++ b/idea/testData/shortenRefsFir/types/ParameterTypeTopLevelTypeWins.kt.after
@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+import dependency.*
+
+class T
+
+fun foo(t: T) {}
\ No newline at end of file
diff --git a/idea/testData/shortenRefsFir/types/VariableType.kt b/idea/testData/shortenRefsFir/types/VariableType.kt
new file mode 100644
index 00000000000..7033b0dce7e
--- /dev/null
+++ b/idea/testData/shortenRefsFir/types/VariableType.kt
@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+class T
+
+fun foo() {
+    <selection>var t: test.T</selection>
+}
diff --git a/idea/testData/shortenRefsFir/types/VariableType.kt.after b/idea/testData/shortenRefsFir/types/VariableType.kt.after
new file mode 100644
index 00000000000..30597c424b5
--- /dev/null
+++ b/idea/testData/shortenRefsFir/types/VariableType.kt.after
@@ -0,0 +1,8 @@
+// FIR_COMPARISON
+package test
+
+class T
+
+fun foo() {
+    var t: T
+}
diff --git a/idea/testData/shortenRefsFir/types/VariableTypeConflictWithLocalType.kt b/idea/testData/shortenRefsFir/types/VariableTypeConflictWithLocalType.kt
new file mode 100644
index 00000000000..ee40900144f
--- /dev/null
+++ b/idea/testData/shortenRefsFir/types/VariableTypeConflictWithLocalType.kt
@@ -0,0 +1,10 @@
+// FIR_COMPARISON
+package test
+
+class T
+
+fun foo() {
+    class T
+
+    <selection>var t: test.T</selection>
+}
diff --git a/idea/testData/shortenRefsFir/types/VariableTypeConflictWithLocalType.kt.after b/idea/testData/shortenRefsFir/types/VariableTypeConflictWithLocalType.kt.after
new file mode 100644
index 00000000000..38832f8df51
--- /dev/null
+++ b/idea/testData/shortenRefsFir/types/VariableTypeConflictWithLocalType.kt.after
@@ -0,0 +1,10 @@
+// FIR_COMPARISON
+package test
+
+class T
+
+fun foo() {
+    class T
+
+    var t: test.T
+}