diff --git a/Tests/Java/CMakeLists.txt b/Tests/Java/CMakeLists.txt
index 26be60c69..4eccbfdfe 100644
--- a/Tests/Java/CMakeLists.txt
+++ b/Tests/Java/CMakeLists.txt
@@ -17,19 +17,20 @@ IF(OLD_CUSTOM_COMMAND_WAY)
   ADD_CUSTOM_COMMAND(
     OUTPUT ${hello_BINARY_DIR}/A.class
     MAIN_DEPENDENCY ${hello_SOURCE_DIR}/A.java
-    COMMAND ${CMAKE_Java_COMPILER} ARGS -d ${hello_BINARY_DIR} ${hello_SOURCE_DIR}/A.java)
+    COMMAND ${CMAKE_Java_COMPILER} ARGS -classpath . -d ${hello_BINARY_DIR} ${hello_SOURCE_DIR}/A.java)
   ADD_CUSTOM_COMMAND(
     OUTPUT ${hello_BINARY_DIR}/HelloWorld.class
     MAIN_DEPENDENCY ${hello_SOURCE_DIR}/HelloWorld.java
-    COMMAND ${CMAKE_Java_COMPILER} ARGS -d ${hello_BINARY_DIR} ${hello_SOURCE_DIR}/HelloWorld.java)
-  
-  ADD_CUSTOM_TARGET(foo.jar ALL 
-    DEPENDS ${hello_BINARY_DIR}/A.class ${hello_BINARY_DIR}/HelloWorld.class)
-  
-  ADD_CUSTOM_COMMAND( TARGET foo.jar
-    PRE_BUILD
+    DEPENDS ${hello_BINARY_DIR}/A.class
+    COMMAND ${CMAKE_Java_COMPILER} ARGS -classpath . -d ${hello_BINARY_DIR} ${hello_SOURCE_DIR}/HelloWorld.java)
+  ADD_CUSTOM_COMMAND(
+    OUTPUT ${hello_BINARY_DIR}/foo.jar
+    DEPENDS ${hello_BINARY_DIR}/A.class ${hello_BINARY_DIR}/HelloWorld.class
     COMMAND ${CMAKE_COMMAND}
     ARGS -E chdir ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_Java_ARCHIVE}
     -cvf foo.jar *.class)
+  
+  ADD_CUSTOM_TARGET(foo.jar ALL 
+    DEPENDS ${hello_BINARY_DIR}/foo.jar)
 ENDIF(OLD_CUSTOM_COMMAND_WAY)