diff --git a/Examples/test-suite/name.i b/Examples/test-suite/name.i
index 8af8cd68b..6b3a425c7 100644
--- a/Examples/test-suite/name.i
+++ b/Examples/test-suite/name.i
@@ -4,6 +4,8 @@
 
 %module name
 
+#pragma SWIG nowarn=121 // %name is deprecated. Use %rename instead.
+
 #ifdef SWIGGUILE
 %rename foo_1 "foo-2";
 #else
diff --git a/Examples/test-suite/name_cxx.i b/Examples/test-suite/name_cxx.i
index 3b6965487..b7bdbf2de 100644
--- a/Examples/test-suite/name_cxx.i
+++ b/Examples/test-suite/name_cxx.i
@@ -4,6 +4,8 @@
 
 %module name_cxx
 
+#pragma SWIG nowarn=121 // %name is deprecated. Use %rename instead.
+
 %name("bar_int")
 %inline %{
 void bar(int i) {}
@@ -14,3 +16,16 @@ void bar(int i) {}
 void bar(double i) {}
 %}
 
+// %name inheritance test
+%{
+class A {
+};
+
+class B : public A {
+};
+
+%}
+
+%name(AA) class A { };
+class B : public A { };
+