diff --git a/SWIG/Examples/test-suite/java_enums.i b/SWIG/Examples/test-suite/java_enums.i
index 9d2d9aded..27197a197 100644
--- a/SWIG/Examples/test-suite/java_enums.i
+++ b/SWIG/Examples/test-suite/java_enums.i
@@ -10,3 +10,21 @@
 enum stuff { FIDDLE = 2*100,  STICKS = 5+8, BONGO, DRUMS };
 %}
 
+// Check that the enum typemaps are working by using a short for the enums instead of int
+%javaconst(0); // will create compile errors in runme file if short typemaps not used 
+%typemap(jtype) enum nonsense "short"
+%typemap(jstype) enum nonsense "short"
+%typemap(javain) enum nonsense "$javainput"
+%typemap(in) enum nonsense %{ $1 = (short)$input; %}
+%typemap(out) enum nonsense %{ $result = (jshort)$1; %}
+%typemap(jni) enum nonsense "jshort"
+%typemap(javaout) enum nonsense {
+    return $jnicall;
+  }
+
+
+%inline %{
+enum nonsense { POPPYCOCK, JUNK };
+nonsense test1(nonsense n) { return n; }
+enum nonsense test2(enum nonsense n) { return n; }
+%}