diff --git a/idea/testData/copyPaste/conversion/ExtendsTypeRef.expected.kt b/idea/testData/copyPaste/conversion/ExtendsTypeRef.expected.kt
new file mode 100644
index 00000000000..f7700061179
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/ExtendsTypeRef.expected.kt
@@ -0,0 +1 @@
+class B : X<String, X<Int, Any>>
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/ExtendsTypeRef.java b/idea/testData/copyPaste/conversion/ExtendsTypeRef.java
new file mode 100644
index 00000000000..f3530dfc0f2
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/ExtendsTypeRef.java
@@ -0,0 +1,7 @@
+class X<T, U> {
+
+}
+
+class A extends <selection>X<String, X<Integer, Object>></selection> {
+
+}
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/ExtendsTypeRef.to.kt b/idea/testData/copyPaste/conversion/ExtendsTypeRef.to.kt
new file mode 100644
index 00000000000..890ad3e27ed
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/ExtendsTypeRef.to.kt
@@ -0,0 +1 @@
+class B : <caret>
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/ImplementsTypeRef.expected.kt b/idea/testData/copyPaste/conversion/ImplementsTypeRef.expected.kt
new file mode 100644
index 00000000000..f7700061179
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/ImplementsTypeRef.expected.kt
@@ -0,0 +1 @@
+class B : X<String, X<Int, Any>>
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/ImplementsTypeRef.java b/idea/testData/copyPaste/conversion/ImplementsTypeRef.java
new file mode 100644
index 00000000000..5c77aac40d4
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/ImplementsTypeRef.java
@@ -0,0 +1,7 @@
+interface X<T, U> {
+
+}
+
+class A implements <selection>X<String, X<Integer, Object>></selection> {
+
+}
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/ImplementsTypeRef.to.kt b/idea/testData/copyPaste/conversion/ImplementsTypeRef.to.kt
new file mode 100644
index 00000000000..890ad3e27ed
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/ImplementsTypeRef.to.kt
@@ -0,0 +1 @@
+class B : <caret>
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/RawTypeRef.expected.kt b/idea/testData/copyPaste/conversion/RawTypeRef.expected.kt
new file mode 100644
index 00000000000..203dd6d19a3
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/RawTypeRef.expected.kt
@@ -0,0 +1 @@
+class B : X<Any>
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/RawTypeRef.java b/idea/testData/copyPaste/conversion/RawTypeRef.java
new file mode 100644
index 00000000000..2f99a9c53d5
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/RawTypeRef.java
@@ -0,0 +1,7 @@
+interface X<T> {
+
+}
+
+class A implements <selection>X</selection> {
+
+}
\ No newline at end of file
diff --git a/idea/testData/copyPaste/conversion/RawTypeRef.to.kt b/idea/testData/copyPaste/conversion/RawTypeRef.to.kt
new file mode 100644
index 00000000000..890ad3e27ed
--- /dev/null
+++ b/idea/testData/copyPaste/conversion/RawTypeRef.to.kt
@@ -0,0 +1 @@
+class B : <caret>
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java
index 8c5436d5869..f8eba631f9a 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java
@@ -107,6 +107,12 @@ public class JavaToKotlinCopyPasteConversionTestGenerated extends AbstractJavaTo
         doTest(fileName);
     }
 
+    @TestMetadata("ExtendsTypeRef.java")
+    public void testExtendsTypeRef() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ExtendsTypeRef.java");
+        doTest(fileName);
+    }
+
     @TestMetadata("FieldWithNoEndComment.java")
     public void testFieldWithNoEndComment() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/FieldWithNoEndComment.java");
@@ -131,6 +137,12 @@ public class JavaToKotlinCopyPasteConversionTestGenerated extends AbstractJavaTo
         doTest(fileName);
     }
 
+    @TestMetadata("ImplementsTypeRef.java")
+    public void testImplementsTypeRef() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/ImplementsTypeRef.java");
+        doTest(fileName);
+    }
+
     @TestMetadata("Imports1.java")
     public void testImports1() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/Imports1.java");
@@ -197,6 +209,12 @@ public class JavaToKotlinCopyPasteConversionTestGenerated extends AbstractJavaTo
         doTest(fileName);
     }
 
+    @TestMetadata("RawTypeRef.java")
+    public void testRawTypeRef() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/RawTypeRef.java");
+        doTest(fileName);
+    }
+
     @TestMetadata("RedundantTypeCast.java")
     public void testRedundantTypeCast() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("idea/testData/copyPaste/conversion/RedundantTypeCast.java");