diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in
index df5f06217..2324b463b 100644
--- a/Examples/test-suite/java/Makefile.in
+++ b/Examples/test-suite/java/Makefile.in
@@ -10,11 +10,13 @@ top_srcdir   = @top_srcdir@/..
 top_builddir = @top_builddir@../
 
 C_TEST_CASES = \
-	java_lib_arrays
+	java_lib_arrays \
+	java_lib_various
 
 CPP_TEST_CASES = \
 	java_constants \
 	java_enums \
+	java_lib_various \
 	java_jnitypes \
 	java_pragmas \
 	java_throws \
diff --git a/Examples/test-suite/java/java_lib_various_runme.java b/Examples/test-suite/java/java_lib_various_runme.java
new file mode 100644
index 000000000..bf0d41211
--- /dev/null
+++ b/Examples/test-suite/java/java_lib_various_runme.java
@@ -0,0 +1,53 @@
+
+// Test case to check typemaps in various.i
+
+import java_lib_various.*;
+
+public class java_lib_various_runme {
+
+  static {
+    try {
+	System.loadLibrary("java_lib_various");
+    } 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[]) {
+
+    // STRING_ARRAY typemap parameter
+    String animals[] = {"Cat","Dog","Cow","Goat"};
+    if (java_lib_various.check_animals(animals) != 1)
+      throw new RuntimeException("check_animals failed");
+
+    // STRING_ARRAY typemap return value
+    String expected[] = { "Dave", "Mike", "Susan", "John", "Michelle" };
+    String got[] = java_lib_various.get_names();
+    for (int i=0; i<got.length; i++)
+      if ( !got[i].equals(expected[i]) )
+        throw new RuntimeException("Name failed " + i + " " + got[i] + "|" + expected[i]);
+
+    // STRING_ARRAY variable setter
+//    String newLangs[] = { "French", "Italian", "Spanish" };
+//    java_lib_various.setLanguages(newLangs);
+
+    // STRING_ARRAY variable getter
+    String langscheck[] = { "Hungarian", "Afrikaans", "Norwegian" };
+    String langs[] = java_lib_various.getLanguages();
+    for (int i=0; i<langs.length; i++)
+      if ( !langs[i].equals(langscheck[i]) )
+        throw new RuntimeException("Languages read failed " + i + " " + langs[i] + "|" + langscheck[i]);
+
+    // BYTE typemap check
+    byte b[] = new byte[20];
+    java_lib_various.charout(b);
+    String byjovestring = new String("by jove");
+    byte byjove[] = byjovestring.getBytes();
+    for (int i=0; i<byjovestring.length(); i++) {
+      if (byjove[i] != b[i])
+        throw new RuntimeException("By jove, it failed: [" + new String(b) + "]");
+    }
+  }
+
+}
diff --git a/Examples/test-suite/java_lib_various.i b/Examples/test-suite/java_lib_various.i
new file mode 100644
index 000000000..a320be4d5
--- /dev/null
+++ b/Examples/test-suite/java_lib_various.i
@@ -0,0 +1,45 @@
+/* Java various.i library tests */
+%module java_lib_various
+
+%include "various.i"
+
+%apply char **STRING_ARRAY { char **received };
+%apply char **STRING_ARRAY { char **get_names };
+%apply char **STRING_ARRAY { char **languages };
+%apply char *BYTE { char *chars };
+
+%{
+char *langs[] = { "Hungarian", "Afrikaans", "Norwegian", 0 };
+%}
+
+%immutable languages; /* TODO: fix, because there is a problem with setters */
+%inline %{
+char **languages = &langs[0];
+%}
+
+%inline %{
+
+int check_animals(char **received) {
+    const char *expected[] = {"Cat","Dog","Cow","Goat", 0};
+    int strings_match = 1;
+    int i=0;
+    while (expected[i]) {
+        if (strcmp(received[i], expected[i]) != 0)
+            strings_match = 0;
+        i++;
+    }
+    return strings_match;
+}
+
+char **get_names() {
+    static char *values[] = { "Dave", "Mike", "Susan", "John", "Michelle", 0};
+    return &values[0];
+}
+
+void charout(char *chars) {
+    if(chars != NULL)
+        sprintf(chars, "by jove");
+}
+
+%}
+