diff --git a/idea/testData/shortenRefs/typealias/TypeAliasAsCtor.kt b/idea/testData/shortenRefs/typealias/TypeAliasAsCtor.kt
new file mode 100644
index 00000000000..0a952b4d793
--- /dev/null
+++ b/idea/testData/shortenRefs/typealias/TypeAliasAsCtor.kt
@@ -0,0 +1,7 @@
+package test
+
+class WithCtor(val x: Int)
+
+typealias Alias = WithCtor
+
+val x = <selection>test.Alias(1)</selection>
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/typealias/TypeAliasAsCtor.kt.after b/idea/testData/shortenRefs/typealias/TypeAliasAsCtor.kt.after
new file mode 100644
index 00000000000..20dd379497d
--- /dev/null
+++ b/idea/testData/shortenRefs/typealias/TypeAliasAsCtor.kt.after
@@ -0,0 +1,7 @@
+package test
+
+class WithCtor(val x: Int)
+
+typealias Alias = WithCtor
+
+val x = Alias(1)
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/typealias/TypeAliasAsObject.kt b/idea/testData/shortenRefs/typealias/TypeAliasAsObject.kt
new file mode 100644
index 00000000000..53b7654d7c4
--- /dev/null
+++ b/idea/testData/shortenRefs/typealias/TypeAliasAsObject.kt
@@ -0,0 +1,9 @@
+package test
+
+class WithCompanion {
+    companion object
+}
+
+typealias Alias = WithCompanion
+
+val x = <selection>test.Alias</selection>
diff --git a/idea/testData/shortenRefs/typealias/TypeAliasAsObject.kt.after b/idea/testData/shortenRefs/typealias/TypeAliasAsObject.kt.after
new file mode 100644
index 00000000000..417b20cfb0d
--- /dev/null
+++ b/idea/testData/shortenRefs/typealias/TypeAliasAsObject.kt.after
@@ -0,0 +1,9 @@
+package test
+
+class WithCompanion {
+    companion object
+}
+
+typealias Alias = WithCompanion
+
+val x = Alias
diff --git a/idea/testData/shortenRefs/typealias/TypeAliasAsType.kt b/idea/testData/shortenRefs/typealias/TypeAliasAsType.kt
new file mode 100644
index 00000000000..153fd018b76
--- /dev/null
+++ b/idea/testData/shortenRefs/typealias/TypeAliasAsType.kt
@@ -0,0 +1,5 @@
+package test
+
+typealias Str = String
+
+val s: <selection>test.Str</selection> = ""
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/typealias/TypeAliasAsType.kt.after b/idea/testData/shortenRefs/typealias/TypeAliasAsType.kt.after
new file mode 100644
index 00000000000..689087e9208
--- /dev/null
+++ b/idea/testData/shortenRefs/typealias/TypeAliasAsType.kt.after
@@ -0,0 +1,5 @@
+package test
+
+typealias Str = String
+
+val s: Str = ""
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/typealias/TypeAliasAsTypeArgument.kt b/idea/testData/shortenRefs/typealias/TypeAliasAsTypeArgument.kt
new file mode 100644
index 00000000000..0ab308668e9
--- /dev/null
+++ b/idea/testData/shortenRefs/typealias/TypeAliasAsTypeArgument.kt
@@ -0,0 +1,5 @@
+package test
+
+typealias Str = String
+
+fun foo(s: <selection>List<test.Str></selection>) {}
\ No newline at end of file
diff --git a/idea/testData/shortenRefs/typealias/TypeAliasAsTypeArgument.kt.after b/idea/testData/shortenRefs/typealias/TypeAliasAsTypeArgument.kt.after
new file mode 100644
index 00000000000..d091ee741fa
--- /dev/null
+++ b/idea/testData/shortenRefs/typealias/TypeAliasAsTypeArgument.kt.after
@@ -0,0 +1,5 @@
+package test
+
+typealias Str = String
+
+fun foo(s: List<Str>) {}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java
index f7976231fe8..80007265f2d 100644
--- a/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java
@@ -469,4 +469,37 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest {
             doTest(fileName);
         }
     }
+
+    @TestMetadata("idea/testData/shortenRefs/typealias")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class Typealias extends AbstractShortenRefsTest {
+        public void testAllFilesPresentInTypealias() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/typealias"), Pattern.compile("^([^\\.]+)\\.kt$"), true);
+        }
+
+        @TestMetadata("TypeAliasAsCtor.kt")
+        public void testTypeAliasAsCtor() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/typealias/TypeAliasAsCtor.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("TypeAliasAsObject.kt")
+        public void testTypeAliasAsObject() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/typealias/TypeAliasAsObject.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("TypeAliasAsType.kt")
+        public void testTypeAliasAsType() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/typealias/TypeAliasAsType.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("TypeAliasAsTypeArgument.kt")
+        public void testTypeAliasAsTypeArgument() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/shortenRefs/typealias/TypeAliasAsTypeArgument.kt");
+            doTest(fileName);
+        }
+    }
 }