diff --git a/test/java/foundation/pEp/jniadapter/test/Makefile.conf b/test/java/foundation/pEp/jniadapter/test/Makefile.conf
index 79ac8d4..ad81a1b 100644
--- a/test/java/foundation/pEp/jniadapter/test/Makefile.conf
+++ b/test/java/foundation/pEp/jniadapter/test/Makefile.conf
@@ -18,7 +18,15 @@ PEP_HOME_DIR=$(PEP_HOME_DIR_ALICE)
 CLASSPATH=.:$(DIST_DIR)/pEp.jar
 LD_LIB_PATH=.:$(DIST_DIR)
 
-JAVA=java -enableassertions -Xcheck:jni  -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -cp $(CLASSPATH) -Djava.library.path=$(LD_LIB_PATH)
+# Java cmd-line options
+JAVA_OPT_ASSERTIONS=-enableassertions
+JAVA_OPT_XCHECK=-Xcheck:jni
+JAVA_OPT_REMOTE_DEBUGGER=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=localhost:5005 -cp $(CLASSPATH) -Djava.library.path=$(LD_LIB_PATH)
+JAVA_OPT_CLASSPATH=-cp $(CLASSPATH) -Djava.library.path=$(LD_LIB_PATH)
+JAVA_OPT_LIBARY_PATH=-Djava.library.path=$(LD_LIB_PATH)
+
+JAVA_OPTS=$(JAVA_OPT_ASSERTIONS) $(JAVA_OPT_XCHECK) $(JAVA_OPT_REMOTE_DEBUGGER) $(JAVA_OPT_CLASSPATH) $(JAVA_OPT_LIBARY_PATH)
+JAVA=java $(JAVA_OPTS)
 
 PITYTEST_DIR=../../../pitytest