diff --git a/eclipse.platform.releng/bundles/org.eclipse.test/META-INF/MANIFEST.MF b/eclipse.platform.releng/bundles/org.eclipse.test/META-INF/MANIFEST.MF
index 33bb48d6f73..666cc1adbc4 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.test/META-INF/MANIFEST.MF
+++ b/eclipse.platform.releng/bundles/org.eclipse.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.test; singleton:=true
-Bundle-Version: 3.6.400.qualifier
+Bundle-Version: 3.6.500.qualifier
 Eclipse-BundleShape: dir
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/Screenshots.java b/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/Screenshots.java
index 385c641748c..864d54df626 100644
--- a/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/Screenshots.java
+++ b/eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/Screenshots.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016 IBM Corporation and others.
+ * Copyright (c) 2016, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -124,13 +124,22 @@ public static File getResultsDirectory() {
     }
 
     private static File getJunitReportOutput() {
-        String[] args = Platform.getCommandLineArgs();
-        for (int i = 0; i < args.length - 1; i++) {
-            if ("-junitReportOutput".equals(args[i])) { // see library.xml and org.eclipse.test.EclipseTestRunner
-                return new File(args[i + 1]).getAbsoluteFile();
-            }
-        }
-        return null;
+		boolean platformAvailable = false;
+		try {
+			Class.forName("org.eclipse.core.runtime.Platform", false, Screenshots.class.getClassLoader());
+			platformAvailable = true;
+		} catch (ClassNotFoundException e) {
+			platformAvailable = false;
+		}
+		if (platformAvailable) {
+			String[] args = Platform.getCommandLineArgs();
+			for (int i = 0; i < args.length - 1; i++) {
+				if ("-junitReportOutput".equals(args[i])) { // see library.xml and org.eclipse.test.EclipseTestRunner
+					return new File(args[i + 1]).getAbsoluteFile();
+				}
+			}
+		}
+		return null;
     }
 
     /**