diff --git a/SWIG/Examples/test-suite/template_typemaps.i b/SWIG/Examples/test-suite/template_typemaps.i
new file mode 100644
index 000000000..2a5125389
--- /dev/null
+++ b/SWIG/Examples/test-suite/template_typemaps.i
@@ -0,0 +1,42 @@
+%module template_typemap
+
+
+%typemap(in) Integer 
+{
+  /* do nothing */
+}
+
+%typemap(out) Integer 
+{
+  /* do nothing */
+}
+
+%{
+  typedef int Integer;
+%}
+
+
+%inline %{
+
+  template <class T>
+    struct Foo 
+    {
+      T val;
+      
+      T get_val() const 
+      {
+	return val;
+      }
+
+      void set_val(T v) 
+      {
+	val = v;
+      }
+    };  
+%}
+
+%template(Foo_i) Foo<int>;
+%template(Foo_I) Foo<Integer>;
+
+
+