diff --git a/Examples/test-suite/java_constants.i b/Examples/test-suite/java_constants.i
index d3cd48f17..220485361 100644
--- a/Examples/test-suite/java_constants.i
+++ b/Examples/test-suite/java_constants.i
@@ -25,6 +25,11 @@
 
 %constant int BRISTOLS=800;
 
+%javaconstvalue(100L) APPLES;
+%inline %{
+#define APPLES 100LL
+%}
+
 %javaconst(0);
 %constant long long ROSY=900LL;
 
diff --git a/Examples/test-suite/java_enums.i b/Examples/test-suite/java_enums.i
index f81320995..54b8b5e22 100644
--- a/Examples/test-suite/java_enums.i
+++ b/Examples/test-suite/java_enums.i
@@ -38,3 +38,14 @@ enum nonsense { POPPYCOCK, JUNK };
 nonsense test1(nonsense n) { return n; }
 enum nonsense test2(enum nonsense n) { return n; }
 %}
+
+// Test the %javaconstvalue directive for enums
+%{
+static const int FOUR = 4;
+%}
+
+%javaconst(1);
+%javaconstvalue(4) Quattro;
+%inline %{
+enum Numero { Quattro = FOUR };
+%}