diff --git a/idea/testData/refactoring/rename/renameKotlinFunctionInGenericClass/after/RenameKotlinFunctionInGenericClass.kt b/idea/testData/refactoring/rename/renameKotlinFunctionInGenericClass/after/RenameKotlinFunctionInGenericClass.kt
new file mode 100644
index 00000000000..96af1f62c0b
--- /dev/null
+++ b/idea/testData/refactoring/rename/renameKotlinFunctionInGenericClass/after/RenameKotlinFunctionInGenericClass.kt
@@ -0,0 +1,12 @@
+package test
+
+open class A<T> {
+    open fun bar() {
+    }
+}
+
+class B<T> : A<T>() {
+    override fun bar() {
+        super.bar()
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/refactoring/rename/renameKotlinFunctionInGenericClass/before/RenameKotlinFunctionInGenericClass.kt b/idea/testData/refactoring/rename/renameKotlinFunctionInGenericClass/before/RenameKotlinFunctionInGenericClass.kt
new file mode 100644
index 00000000000..11075b8203d
--- /dev/null
+++ b/idea/testData/refactoring/rename/renameKotlinFunctionInGenericClass/before/RenameKotlinFunctionInGenericClass.kt
@@ -0,0 +1,12 @@
+package test
+
+open class A<T> {
+    open fun foo() {
+    }
+}
+
+class B<T> : A<T>() {
+    override fun foo() {
+        super.foo()
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/refactoring/rename/renameKotlinFunctionInGenericClass/renameKotlinFunctionInGenericClass.test b/idea/testData/refactoring/rename/renameKotlinFunctionInGenericClass/renameKotlinFunctionInGenericClass.test
new file mode 100644
index 00000000000..aab8355ae4e
--- /dev/null
+++ b/idea/testData/refactoring/rename/renameKotlinFunctionInGenericClass/renameKotlinFunctionInGenericClass.test
@@ -0,0 +1,6 @@
+{
+  "type": "KOTLIN_FUNCTION",
+  "classId": "test/A",
+  "oldName": "foo",
+  "newName": "bar"
+}
\ No newline at end of file
diff --git a/idea/testData/refactoring/rename/renameKotlinFunctionInGenericClass/renameKotlinFunctionInGenericClassFromSubclass.test b/idea/testData/refactoring/rename/renameKotlinFunctionInGenericClass/renameKotlinFunctionInGenericClassFromSubclass.test
new file mode 100644
index 00000000000..76583dfa825
--- /dev/null
+++ b/idea/testData/refactoring/rename/renameKotlinFunctionInGenericClass/renameKotlinFunctionInGenericClassFromSubclass.test
@@ -0,0 +1,6 @@
+{
+  "type": "KOTLIN_FUNCTION",
+  "classId": "test/B",
+  "oldName": "foo",
+  "newName": "bar"
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java
index ebbb803be55..03602a3f023 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java
@@ -813,6 +813,16 @@ public class RenameTestGenerated extends AbstractRenameTest {
         runTest("idea/testData/refactoring/rename/renameKotlinFunctionInEnum/renameKotlinFunctionInEnumFromSubclass.test");
     }
 
+    @TestMetadata("renameKotlinFunctionInGenericClass/renameKotlinFunctionInGenericClass.test")
+    public void testRenameKotlinFunctionInGenericClass_RenameKotlinFunctionInGenericClass() throws Exception {
+        runTest("idea/testData/refactoring/rename/renameKotlinFunctionInGenericClass/renameKotlinFunctionInGenericClass.test");
+    }
+
+    @TestMetadata("renameKotlinFunctionInGenericClass/renameKotlinFunctionInGenericClassFromSubclass.test")
+    public void testRenameKotlinFunctionInGenericClass_RenameKotlinFunctionInGenericClassFromSubclass() throws Exception {
+        runTest("idea/testData/refactoring/rename/renameKotlinFunctionInGenericClass/renameKotlinFunctionInGenericClassFromSubclass.test");
+    }
+
     @TestMetadata("renameKotlinFunctionParameterWithByNameUsages/renameKotlinFunctionParameterWithByNameUsages.test")
     public void testRenameKotlinFunctionParameterWithByNameUsages_RenameKotlinFunctionParameterWithByNameUsages() throws Exception {
         runTest("idea/testData/refactoring/rename/renameKotlinFunctionParameterWithByNameUsages/renameKotlinFunctionParameterWithByNameUsages.test");