diff --git a/libexec/trick/java/lib/JUnitXmlFormatter.jar b/libexec/trick/java/lib/JUnitXmlFormatter.jar
deleted file mode 100644
index f931412c..00000000
Binary files a/libexec/trick/java/lib/JUnitXmlFormatter.jar and /dev/null differ
diff --git a/trick_source/java/test/Makefile b/trick_source/java/test/Makefile
index cce524e7..870ec318 100644
--- a/trick_source/java/test/Makefile
+++ b/trick_source/java/test/Makefile
@@ -36,34 +36,35 @@ RESOURCES += $(subst src/,,$(shell find src/trick -name jaxb.index))
 
 all: test
 	@echo "Java test successful"
+
 test: ${TEST_DIR}/test.jar ${TRICK_TEST}
 	@echo "trick.common.RunTimeTrickApplicationTest"
-	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_RunTimeTrickApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.common.RunTimeTrickApplicationTest
+	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.common.RunTimeTrickApplicationTest
 	@echo "trick.common.TrickApplicationTest"
-	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_TrickApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.common.TrickApplicationTest
+	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.common.TrickApplicationTest
 	@echo "trick.common.utils.LogHeaderReaderTest"
-	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_LogHeaderReaderTest.xml barrypitman.junitXmlFormatter.Runner trick.common.utils.LogHeaderReaderTest
+	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.common.utils.LogHeaderReaderTest
 	@# Error with UnitTypeTest
-	@# java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_UnitTypeTest.xml barrypitman.junitXmlFormatter.Runner trick.common.utils.UnitTypeTest
+	@# java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.common.utils.UnitTypeTest
 	@echo "trick.dataproducts.trickdp.TrickDPApplicationTest"
-	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_TrickDPApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.dataproducts.trickdp.TrickDPApplicationTest
+	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.dataproducts.trickdp.TrickDPApplicationTest
 	@echo "trick.dataproducts.trickqp.TrickQPApplicationTest"
-	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_TrickQPApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.dataproducts.trickqp.TrickQPApplicationTest
+	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.dataproducts.trickqp.TrickQPApplicationTest
 	@echo "trick.dre.DreApplicationTest"
-	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_DreApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.dre.DreApplicationTest
+	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.dre.DreApplicationTest
 	@echo "trick.montemonitor.MonteMonitorApplicationTest"
-	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_MonteMonitorApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.montemonitor.MonteMonitorApplicationTest
+	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.montemonitor.MonteMonitorApplicationTest
 	@echo "trick.mtv.MtvApplicationTest"
-	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_MtvApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.mtv.MtvApplicationTest
+	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.mtv.MtvApplicationTest
 	@# SieApplicationTest needs to be updated
-	@# java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_SieApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.sie.SieApplicationTest
+	@# java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.sie.SieApplicationTest
 	@echo "trick.sniffer.SnifferApplicationTest"
-	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_SnifferApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.sniffer.SnifferApplicationTest
+	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.sniffer.SnifferApplicationTest
 	@echo "trick.tv.TrickApplicationTest"
-	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_TVApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.tv.TVApplicationTest
+	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.tv.TVApplicationTest
 	@echo "trick.simcontrol.SimControlApplicationTest"
 	@echo "CLICK OK ON GUI TO CONTINUE"
-	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" -Dorg.schmant.task.junit4.target=${TRICK_HOME}/trick_test/Java_SimControlApplicationTest.xml barrypitman.junitXmlFormatter.Runner trick.simcontrol.SimControlApplicationTest
+	@java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.simcontrol.SimControlApplicationTest
 	
 ${DEST_DIR} ${TEST_DIR} ${TRICK_TEST}:
 	mkdir -p $@