diff --git a/Examples/test-suite/java/typedef_classforward_same_name_runme.java b/Examples/test-suite/java/typedef_classforward_same_name_runme.java
index 23a06b913..86e713d14 100644
--- a/Examples/test-suite/java/typedef_classforward_same_name_runme.java
+++ b/Examples/test-suite/java/typedef_classforward_same_name_runme.java
@@ -15,8 +15,12 @@ public class typedef_classforward_same_name_runme {
   public static void main(String argv[]) {
     Foo foo = new Foo();
     foo.setX(5);
-    if (typedef_classforward_same_name.extract(foo) == 5) {
-      // All good!
-    }
+    if (typedef_classforward_same_name.extractFoo(foo) != 5)
+      throw new RuntimeException("unexpected value");
+
+    Boo boo = new Boo();
+    boo.setX(5);
+    if (typedef_classforward_same_name.extractBoo(boo) != 5)
+      throw new RuntimeException("unexpected value");
   }
-}
\ No newline at end of file
+}
diff --git a/Examples/test-suite/python/typedef_classforward_same_name_runme.py b/Examples/test-suite/python/typedef_classforward_same_name_runme.py
new file mode 100644
index 000000000..61f45fbee
--- /dev/null
+++ b/Examples/test-suite/python/typedef_classforward_same_name_runme.py
@@ -0,0 +1,11 @@
+from typedef_classforward_same_name import *
+
+foo = Foo()
+foo.x = 5
+if extractFoo(foo) != 5:
+    raise RuntimeError("unexpected value")
+
+boo = Boo()
+boo.x = 5
+if extractBoo(boo) != 5:
+    raise RuntimeError("unexpected value")
diff --git a/Examples/test-suite/typedef_classforward_same_name.i b/Examples/test-suite/typedef_classforward_same_name.i
index 15e29c693..ad2e456f8 100644
--- a/Examples/test-suite/typedef_classforward_same_name.i
+++ b/Examples/test-suite/typedef_classforward_same_name.i
@@ -5,5 +5,11 @@ typedef struct Foo Foo;
 struct Foo {
    int x;
 };
-int extract(Foo* foo) { return foo->x; }
-%}
\ No newline at end of file
+int extractFoo(Foo* foo) { return foo->x; }
+
+struct Boo {
+   int x;
+};
+typedef struct Boo Boo;
+int extractBoo(Boo* boo) { return boo->x; }
+%}