diff --git a/native/commonizer/tests/org/jetbrains/kotlin/commonizer/hierarchical/HierarchicalClassAndTypeAliasCommonizationTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/hierarchical/HierarchicalClassAndTypeAliasCommonizationTest.kt
new file mode 100644
index 00000000000..14a09df10f9
--- /dev/null
+++ b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/hierarchical/HierarchicalClassAndTypeAliasCommonizationTest.kt
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.commonizer.hierarchical
+
+import org.jetbrains.kotlin.commonizer.AbstractInlineSourcesCommonizationTest
+import org.jetbrains.kotlin.commonizer.assertCommonized
+
+class HierarchicalClassAndTypeAliasCommonizationTest : AbstractInlineSourcesCommonizationTest() {
+
+    fun `test commonization of typeAlias and class`() {
+        val result = commonize {
+            outputTarget("(a, b)")
+            simpleSingleSourceTarget("a", "typealias X = Int")
+            simpleSingleSourceTarget("b", "class X")
+        }
+
+        result.assertCommonized("(a, b)", "expect class X")
+        result.assertCommonized("a", "typealias X = Int")
+        result.assertCommonized("b", "class X")
+    }
+
+    fun `test commonization of typeAlias and class hierarchically`() {
+        val result = commonize {
+            outputTarget("((a, b), (c, d))")
+            simpleSingleSourceTarget("a", "typealias X = Int")
+            simpleSingleSourceTarget("b", "typealias X = Long")
+            simpleSingleSourceTarget("c", "class X")
+            simpleSingleSourceTarget("d", "typealias X = Short")
+        }
+
+        result.assertCommonized("(a, b)", "expect class X")
+        result.assertCommonized("(c, d)", "expect class X")
+        result.assertCommonized("((a, b), (c, d))", "expect class X")
+    }
+
+    fun `test following typeAliases`() {
+        val result = commonize {
+            outputTarget("(a, b)")
+            simpleSingleSourceTarget(
+                "a", """
+                typealias X = NotX
+
+                class NotX(val constructorProperty: Int) {
+                    val property: Int = 42
+                    fun function() = 42
+                }
+            """.trimIndent()
+            )
+
+            simpleSingleSourceTarget(
+                "b", """
+                class X(val constructorProperty: Int) {
+                    val property: Int = 42
+                    fun function() = 42
+                }
+            """.trimIndent()
+            )
+        }
+
+        result.assertCommonized(
+            "(a, b)", """
+            expect class X expect constructor(expect val constructorProperty: Int) {
+                expect val property: Int
+                expect fun function(): Int
+            }
+        """.trimIndent()
+        )
+    }
+
+
+    fun `test following nested typeAliases`() {
+        val result = commonize {
+            outputTarget("(a, b)")
+            simpleSingleSourceTarget(
+                "a", """
+                typealias X = NotX
+                typealias NotX = ReallyNotX 
+                class ReallyNotX(val constructorProperty: Int) {
+                    val property: Int = 42
+                    fun function() = 42
+                }
+            """.trimIndent()
+            )
+
+            simpleSingleSourceTarget(
+                "b", """
+                class X(val constructorProperty: Int) {
+                    val property: Int = 42
+                    fun function() = 42
+                }
+            """.trimIndent()
+            )
+        }
+
+        result.assertCommonized(
+            "(a, b)", """
+            expect class X expect constructor(expect val constructorProperty: Int) {
+                expect val property: Int
+                expect fun function(): Int
+            }
+        """.trimIndent()
+        )
+    }
+}
diff --git a/native/commonizer/tests/org/jetbrains/kotlin/commonizer/hierarchical/HierarchicalTypeAliasCommonizationTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/hierarchical/HierarchicalTypeAliasCommonizationTest.kt
index aa44f6db844..2225ef9ed0e 100644
--- a/native/commonizer/tests/org/jetbrains/kotlin/commonizer/hierarchical/HierarchicalTypeAliasCommonizationTest.kt
+++ b/native/commonizer/tests/org/jetbrains/kotlin/commonizer/hierarchical/HierarchicalTypeAliasCommonizationTest.kt
@@ -33,7 +33,7 @@ class HierarchicalTypeAliasCommonizationTest : AbstractInlineSourcesCommonizatio
     /**
      * See: https://youtrack.jetbrains.com/issue/KT-45992
      */
-    fun `todo test typealias and class`() {
+    fun `test typealias and class`() {
         val result = commonize {
             outputTarget("(a,b)")
             simpleSingleSourceTarget("a", """class X """)
@@ -45,7 +45,7 @@ class HierarchicalTypeAliasCommonizationTest : AbstractInlineSourcesCommonizatio
             )
         }
 
-        result.assertCommonized("(a,b)", "expect class X")
+        result.assertCommonized("(a,b)", "expect class X expect constructor()")
     }
 
     fun `test typealias to different classes`() {