diff --git a/SWIG/Examples/test-suite/csharp/intermediary_classname_runme.cs b/SWIG/Examples/test-suite/csharp/intermediary_classname_runme.cs
new file mode 100644
index 000000000..551f4ed32
--- /dev/null
+++ b/SWIG/Examples/test-suite/csharp/intermediary_classname_runme.cs
@@ -0,0 +1,16 @@
+using System;
+using intermediary_classnameNamespace;
+
+public class runme
+{
+    static void Main() 
+    {
+      // test the renamed module class is correctly named
+      double d = intermediary_classnameModule.maxdouble(10.0, 20.0);
+      if (d!=20.0) throw new Exception("Test failed");
+
+      // test the renamed intermediary class is correctly named
+      IntPtr ptr = intermediary_classname.new_vecdouble(10);
+      intermediary_classname.delete_vecdouble(new System.Runtime.InteropServices.HandleRef(null,ptr));
+    }
+}
diff --git a/SWIG/Examples/test-suite/java/intermediary_classname_runme.java b/SWIG/Examples/test-suite/java/intermediary_classname_runme.java
new file mode 100644
index 000000000..03efc030c
--- /dev/null
+++ b/SWIG/Examples/test-suite/java/intermediary_classname_runme.java
@@ -0,0 +1,24 @@
+
+import intermediary_classname.*;
+
+public class intermediary_classname_runme {
+  static {
+    try {
+        System.loadLibrary("intermediary_classname");
+    } catch (UnsatisfiedLinkError e) {
+      System.err.println("Native code library failed to load. See the chapter on Dynamic Linking Problems in the SWIG Java documentation for help.\n" + e);
+      System.exit(1);
+    }
+  }
+
+  public static void main(String argv[]) 
+  {
+      // test the renamed module class is correctly named
+      double d = intermediary_classnameModule.maxdouble(10.0, 20.0);
+      if (d!=20.0) throw new RuntimeException("Test failed");
+
+      // test the renamed intermediary class is correctly named
+      long ptr = intermediary_classname.new_vecdouble(10);
+      intermediary_classname.delete_vecdouble(ptr);
+  }
+}