diff --git a/ant/build.gant b/ant/build.gant
index e6932bfc7..aba3312cc 100644
--- a/ant/build.gant
+++ b/ant/build.gant
@@ -1090,7 +1090,7 @@ junit = { pluginName ->
   }
 
   ant.path(id: 'junit'){
-    ant.fileset(dir: 'ant/lib', includes: 'junit-*.jar')
+    ant.fileset(dir: 'ant/lib/junit', includes: '*.jar')
   }
   ant.taskdef(name: 'junit', classpathref: 'junit',
       classname: 'org.apache.tools.ant.taskdefs.optional.junit.JUnitTask')
diff --git a/ant/lib/junit-4.9.jar b/ant/lib/junit-4.9.jar
deleted file mode 100644
index fd2cccc54..000000000
Binary files a/ant/lib/junit-4.9.jar and /dev/null differ
diff --git a/ant/lib/junit/hamcrest-core-1.3.jar b/ant/lib/junit/hamcrest-core-1.3.jar
new file mode 100644
index 000000000..9d5fe16e3
Binary files /dev/null and b/ant/lib/junit/hamcrest-core-1.3.jar differ
diff --git a/ant/lib/junit/junit-4.13.1.jar b/ant/lib/junit/junit-4.13.1.jar
new file mode 100644
index 000000000..b376ffc16
Binary files /dev/null and b/ant/lib/junit/junit-4.13.1.jar differ
diff --git a/org.eclim.jdt/build_jdt.gant b/org.eclim.jdt/build_jdt.gant
index 11d5dfbf5..2193430c7 100644
--- a/org.eclim.jdt/build_jdt.gant
+++ b/org.eclim.jdt/build_jdt.gant
@@ -1,6 +1,7 @@
 feature_jdt = 'org.eclipse.jdt'
 
 target(name: 'org.eclim.jdt.classpath'){
+  fileset(dir: 'ant/lib/junit', includes: 'junit-*.jar')
   pluginClasspath{
     include(name: 'dropins/**/plugins/org.eclipse.jdt.debug_*/*.jar')
     include(name: 'plugins/org.eclipse.jdt.debug_*/*.jar')
@@ -21,7 +22,7 @@ target(name: 'org.eclim.jdt.test'){
 
     mkdir(dir: '${eclipse.workspace}/eclim_unit_test_java/lib')
     copy(tofile: '${eclipse.workspace}/eclim_unit_test_java/lib/junit.jar'){
-      fileset(dir: 'ant/lib', includes: 'junit-*.jar')
+      fileset(dir: 'ant/lib/junit', includes: 'junit-*.jar')
     }
     eclim('-command project_update -p eclim_unit_test_java')
   }
diff --git a/org.eclim.jdt/java/org/eclim/plugin/jdt/command/junit/JUnitCommand.java b/org.eclim.jdt/java/org/eclim/plugin/jdt/command/junit/JUnitCommand.java
index d413d7caa..d52570e04 100644
--- a/org.eclim.jdt/java/org/eclim/plugin/jdt/command/junit/JUnitCommand.java
+++ b/org.eclim.jdt/java/org/eclim/plugin/jdt/command/junit/JUnitCommand.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2012 - 2014  Eric Van Dewoestine
+ * Copyright (C) 2012 - 2020  Eric Van Dewoestine
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -255,6 +255,10 @@ private JUnitTask createJUnitTask(
     classpath.createPathElement().setPath(pathName + "/lib/ant-junit.jar");
     classpath.createPathElement().setPath(pathName + "/lib/ant-junit4.jar");
 
+    bundle = Platform.getBundle("org.hamcrest.core");
+    pathName = FileLocator.getBundleFile(bundle).getPath();
+    classpath.createPathElement().setPath(pathName);
+
     bundle = Platform.getBundle("org.eclim.jdt");
     pathName = FileLocator.getBundleFile(bundle).getPath();
     classpath.createPathElement().setPath(pathName + "/eclim.jdt.jar");