diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index f1b63ad5d..5e2939d75 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -834,9 +834,8 @@ public class JUnitTask extends Task {
         try {
             log("Using System properties " + System.getProperties(),
                 Project.MSG_VERBOSE);
-            Path userClasspath = commandline.getClasspath();
-            if (userClasspath != null) {
-                cl = createClassLoader();
+            cl = createClassLoader();
+            if (cl != null) {
                 cl.setThreadContextLoader();
             }
             runner = new JUnitTestRunner(test, test.getHaltonerror(),