diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in
index 986c230cc..ee6011ff8 100644
--- a/Examples/test-suite/java/Makefile.in
+++ b/Examples/test-suite/java/Makefile.in
@@ -6,9 +6,11 @@ LANGUAGE     = java
 JAVA         = @JAVA@
 JAVAC        = @JAVAC@
 JAVAFLAGS    = @JAVAFLAGS@
-JAVA_CLASSPATH_SEP := @JAVA_CLASSPATH_SEP@
+JAVA_CLASSPATH_SEP = @JAVA_CLASSPATH_SEP@
 SCRIPTSUFFIX = _runme.java
 
+JAVA_HOME ?= @JAVA_HOME@
+
 srcdir       = @srcdir@
 top_srcdir   = ../@top_srcdir@
 top_builddir = ../@top_builddir@
diff --git a/configure.ac b/configure.ac
index 7313dbd3f..7b9e8433a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1391,6 +1391,7 @@ fi
 # Turned off due to spurious warnings in later versions of openjdk-1.8
 # JAVAFLAGS=-Xcheck:jni
 
+AC_SUBST(JAVA_HOME)
 AC_SUBST(JAVA)
 AC_SUBST(JAVAC)
 AC_SUBST(JAVAINC)