diff --git a/bindings/java/CMakeLists.txt b/bindings/java/CMakeLists.txt
index 80ff1d1388..f97e12d51b 100644
--- a/bindings/java/CMakeLists.txt
+++ b/bindings/java/CMakeLists.txt
@@ -169,8 +169,6 @@ file(WRITE ${MANIFEST_FILE} ${MANIFEST_TEXT})
 add_jar(fdb-java ${JAVA_BINDING_SRCS} ${GENERATED_JAVA_FILES} ${CMAKE_SOURCE_DIR}/LICENSE
   OUTPUT_DIR ${PROJECT_BINARY_DIR}/lib VERSION ${CMAKE_PROJECT_VERSION} MANIFEST ${MANIFEST_FILE})
 add_dependencies(fdb-java fdb_java_options fdb_java)
-add_jar(foundationdb-tests SOURCES ${JAVA_TESTS_SRCS} INCLUDE_JARS fdb-java)
-add_dependencies(foundationdb-tests fdb_java_options)
 
 # TODO[mpilman]: The java RPM will require some more effort (mostly on debian). However,
 # most people will use the fat-jar, so it is not clear how high this priority is.
@@ -237,6 +235,16 @@ if(NOT OPEN_FOR_IDE)
     WORKING_DIRECTORY ${unpack_dir}
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/lib_copied
     COMMENT "Build ${target_jar}")
+  add_jar(foundationdb-tests SOURCES ${JAVA_TESTS_SRCS} INCLUDE_JARS fdb-java)
+  add_dependencies(foundationdb-tests fdb_java_options)
+  set(tests_jar ${jar_destination}/fdb-java-${CMAKE_PROJECT_VERSION}${prerelease_string}-tests.jar)
+  add_custom_command(OUTPUT ${tests_jar}
+    COMMAND ${CMAKE_COMMAND} -E copy foundationdb-tests.jar "${tests_jar}"
+    WORKING_DIRECTORY .
+    DEPENDS foundationdb-tests
+    COMMENT "Build ${tests_jar}")
+  add_custom_target(fdb-java-tests ALL DEPENDS ${tests_jar})
+  add_dependencies(fdb-java-tests foundationdb-tests)
   add_custom_target(fat-jar ALL DEPENDS ${target_jar})
   add_dependencies(fat-jar fdb-java)
   add_dependencies(fat-jar copy_lib)