diff --git a/JenkinsJobs/AutomatedTests/I_unit_mac.groovy b/JenkinsJobs/AutomatedTests/I_unit_mac.groovy
index b73583c3283..3bf1e9a5140 100644
--- a/JenkinsJobs/AutomatedTests/I_unit_mac.groovy
+++ b/JenkinsJobs/AutomatedTests/I_unit_mac.groovy
@@ -38,7 +38,6 @@ pipeline {
               ANT_HOME = tool(type:'ant', name:'apache-ant-latest')
               PATH = "${JAVA_HOME}/bin:${ANT_HOME}/bin:${PATH}"
               ANT_OPTS = "-Djava.io.tmpdir=${WORKSPACE}/tmp -Djava.security.manager=allow"
-              eclipseArch = \'''' + ARCH + ''''
           }
           steps {
               cleanWs() // workspace not cleaned by default
@@ -75,7 +74,7 @@ java -XshowSettings -version 1>javaSettings.txt 2>&1
 
 ant -f getEBuilder.xml -DbuildId=${buildId} -DeclipseStream=${STREAM} -DEBUILDER_HASH=${EBUILDER_HASH} \\
   -DdownloadURL=https://download.eclipse.org/eclipse/downloads/drops4/${buildId} \\
-  -Dosgi.os=macosx -Dosgi.ws=cocoa -Dosgi.arch=${eclipseArch} \\
+  -Dosgi.os=macosx -Dosgi.ws=cocoa -Dosgi.arch=''' + ARCH + ''' \\
   -DtestSuite=all
 # For smaller test-suites see: https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/be721e33c916b03c342e7b6f334220c6124946f8/production/testScripts/configuration/sdk.tests/testScripts/test.xml#L1893-L1903
               \'\'\'
diff --git a/JenkinsJobs/SmokeTests/smoke_test_arm64.groovy b/JenkinsJobs/SmokeTests/smoke_test_arm64.groovy
index 6708c313db5..aeb9c5c0014 100644
--- a/JenkinsJobs/SmokeTests/smoke_test_arm64.groovy
+++ b/JenkinsJobs/SmokeTests/smoke_test_arm64.groovy
@@ -78,7 +78,6 @@ echo JAVA_HOME: $JAVA_HOME
 echo PATH: $PATH
 
 export ANT_OPTS="${ANT_OPTS} -Djava.io.tmpdir=${WORKSPACE}/tmp ${secManager}"
-export eclipseArch=aarch64
 
 env 1>envVars.txt 2>&1
 ant -diagnostics 1>antDiagnostics.txt 2>&1
diff --git a/JenkinsJobs/SmokeTests/smoke_test_ppcle.groovy b/JenkinsJobs/SmokeTests/smoke_test_ppcle.groovy
index 3d9bbaacda8..3dec1ee87a4 100644
--- a/JenkinsJobs/SmokeTests/smoke_test_ppcle.groovy
+++ b/JenkinsJobs/SmokeTests/smoke_test_ppcle.groovy
@@ -80,7 +80,6 @@ echo JAVA_HOME: $JAVA_HOME
 echo PATH: $PATH
 
 export ANT_OPTS="${ANT_OPTS} -Djava.io.tmpdir=${WORKSPACE}/tmp ${secMananger}"
-export eclipseArch=ppc64le
 
 env 1>envVars.txt 2>&1
 ant -diagnostics 1>antDiagnostics.txt 2>&1
diff --git a/JenkinsJobs/YBuilds/Y_unit_mac64_java17.groovy b/JenkinsJobs/YBuilds/Y_unit_mac64_java17.groovy
index 1e3775fbec4..3137903d6e1 100644
--- a/JenkinsJobs/YBuilds/Y_unit_mac64_java17.groovy
+++ b/JenkinsJobs/YBuilds/Y_unit_mac64_java17.groovy
@@ -120,7 +120,6 @@ env  1>envVars.txt 2>&1
 ant -diagnostics  1>antDiagnostics.txt 2>&1
 java -XshowSettings -version  1>javaSettings.txt 2>&1
 
-export eclipseArch=x86_64
 ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId  -DeclipseStream=$STREAM -DEBUILDER_HASH=${EBUILDER_HASH}  -DdownloadURL=https://download.eclipse.org/eclipse/downloads/drops4/${buildId}  -Dosgi.os=macosx -Dosgi.ws=cocoa -Dosgi.arch=x86_64 -DtestSuite=${testSuite}
 
 RAW_DATE_END="$(date +%s )"
diff --git a/JenkinsJobs/YBuilds/Y_unit_macM1_java17.groovy b/JenkinsJobs/YBuilds/Y_unit_macM1_java17.groovy
index c19a01e7187..d62f269c87e 100644
--- a/JenkinsJobs/YBuilds/Y_unit_macM1_java17.groovy
+++ b/JenkinsJobs/YBuilds/Y_unit_macM1_java17.groovy
@@ -113,9 +113,6 @@ echo JAVA_HOME: $JAVA_HOME
 echo ANT_HOME: $ANT_HOME
 echo PATH: $PATH
 
-export eclipseArch=aarch64
-
-
 env  1>envVars.txt 2>&1
 ant -diagnostics  1>antDiagnostics.txt 2>&1
 java -XshowSettings -version  1>javaSettings.txt 2>&1
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux/platformSpecific.properties b/production/testScripts/configuration/sdk.tests/testConfigs/linux/platformSpecific.properties
index e8829369456..dd931f9d272 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/linux/platformSpecific.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux/platformSpecific.properties
@@ -20,7 +20,7 @@
 testExecutable=bash
 
 #name of script to execute
-testScript=./testAll.sh
+testScript=./runtests.sh
 
 # This value gets written to the "preference file", named org.eclipse.core.net.prefs.
 # We implement as a property string, since eventually we may test multiple proxy settings.
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh
deleted file mode 100755
index 65789ef4980..00000000000
--- a/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env bash
-
-echo "command line as passed into $(basename ${0}): ${*}"
-echo "command line (quoted) as passed into $(basename ${0}): ${@}"
-
-# This file, localBuildProperties.shsource, should never exist or be needed for production machine,
-# but allows an easy way for a "local user" to provide this file
-# somewhere on the search path ($HOME/bin is common),
-# and it will be included here, thus can provide "override values"
-# to those defined by defaults for production machine.,
-# such as for jvm
-source localBuildProperties.shsource 2>/dev/null
-
-if [[ -z "${propertyFile}" ]]; then
-   echo "expect 'propertyFile' as environment variable for production runs"
-   exit 1
-fi
-if [[ -z "${jvm}" ]]; then
-   echo "expect 'jvm' as environment variable for production runs"
-   exit 1
-fi
-if [[ -z "${testedPlatform}" ]]; then
-   echo "expect 'testedPlatform' as environment variable for production runs"
-   exit 1
-fi
-
-echo "PWD: $PWD"
-# production machine is x86_64, but some local setups may be 32 bit and will need to provide
-# this value in localBuildProperties.shsource. (
-eclipseArch=${eclipseArch:-x86_64}
-
-echo "=== properties in testAll.sh"
-echo "    DOWNLOAD_HOST: ${DOWNLOAD_HOST}"
-echo "    jvm in testAll: ${jvm}"
-echo "    propertyFile in testAll: ${propertyFile}"
-echo "    buildId in testAll: ${buildId}"
-echo "    testedPlatform: ${testedPlatform}"
-echo "    ANT_OPTS: ${ANT_OPTS}"
-echo "    contents of propertyFile:"
-cat ${propertyFile}
-
-#execute command to run tests
-/bin/chmod 755 runtests.sh
-/bin/mkdir -p results/consolelogs
-
-./runtests.sh -os linux -ws gtk -arch $eclipseArch -vm "${jvm}" -properties ${propertyFile} "${@}" > results/consolelogs/${testedPlatform}_consolelog.txt
-
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/platformSpecific.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/platformSpecific.properties
index 7f027801809..71766bcee2d 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/platformSpecific.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/platformSpecific.properties
@@ -26,7 +26,7 @@ loglocationarg=-XX:ErrorFile
 testExecutable=bash
 
 #name of script to execute
-testScript=./testAll.sh
+testScript=./runtestsmac.sh
 
 # This value gets written to the "preference file", named org.eclipse.core.net.prefs.
 # We implement as a property string, since eventually we may test multiple proxy settings.
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh
deleted file mode 100755
index 4670e1a6f22..00000000000
--- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-ulimit -c unlimited
-
-# This file should never exist or be needed for production machine,
-# but allows an easy way for a "local user" to provide this file
-# somewhere on the search path ($HOME/bin is common),
-# and it will be included here, thus can provide "override values"
-# to those defined by defaults for production machine.,
-# such as for jvm
-
-source localBuildProperties.shsource 2>/dev/null
-
-if [[ -z "${propertyFile}" ]]; then
-  echo "expect 'propertyFile' as environment variable for production runs"
-  exit 1
-fi
-if [[ -z "${jvm}" ]]; then
-  echo "expect 'jvm' as environment variable for production runs"
-  exit 1
-fi
-if [[ -z "${testedPlatform}" ]]; then
-  echo "expect 'testedPlatform' as environment variable for production runs"
-  exit 1
-fi
-
-echo "PWD: $PWD"
-
-# production machine is x86_64, but some local setups may be 32 bit and will need to provide
-# this value in localBuildProperties.shsource.
-eclipseArch=${eclipseArch:-x86_64}
-
-echo "=== properties in testAll.sh"
-echo "    DOWNLOAD_HOST: ${DOWNLOAD_HOST}"
-echo "    jvm in testAll: ${jvm}"
-echo "    propertyFile in testAll: ${propertyFile}"
-echo "    buildId in testAll: ${buildId}"
-echo "    testedPlatform: ${testedPlatform}"
-echo "    ANT_OPTS: ${ANT_OPTS}"
-echo "contents of propertyFile:"
-cat ${propertyFile}
-
-#execute command to run tests
-/bin/chmod 755 runtestsmac.sh
-/bin/mkdir -p results/consolelogs
-
-./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -vm "${jvm}" -properties ${propertyFile} $* > results/consolelogs/${testedPlatform}_consolelog.txt
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/windows/platformSpecific.properties b/production/testScripts/configuration/sdk.tests/testConfigs/windows/platformSpecific.properties
index 870274909f4..fafbb17d395 100644
--- a/production/testScripts/configuration/sdk.tests/testConfigs/windows/platformSpecific.properties
+++ b/production/testScripts/configuration/sdk.tests/testConfigs/windows/platformSpecific.properties
@@ -21,7 +21,7 @@ testExecutable=cmd
 
 #name of script to execute
 
-testScript=testAll.bat
+testScript=runtests.bat
 
 # This value gets written to the "preference file", named org.eclipse.core.net.prefs.
 # We implement as a property string, since eventually we may test multiple proxy settings.
diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/windows/testAll.bat b/production/testScripts/configuration/sdk.tests/testConfigs/windows/testAll.bat
deleted file mode 100644
index 7a46230ec6c..00000000000
--- a/production/testScripts/configuration/sdk.tests/testConfigs/windows/testAll.bat
+++ /dev/null
@@ -1,44 +0,0 @@
-@echo off
-SETLOCAL
-
-REM localTestsProperties.bat is not used or expected in production builds,
-REM but is needed for production performance tests and
-REM allows a place for people to have their own machines variables defined
-REM there so they do not have to hand edit each time to do a local build.
-REM a typical example is that their version/location/vendor of VM is likely to differ,
-REM so they could redefine jvm to what's appropriate to their machine and setup.
-
-IF EXIST localTestsProperties.bat CALL localTestsProperties.bat
-
-
-IF NOT DEFINED propertyFile (
-  echo expect 'propertyFile' as environment variable for production runs
-  exit 1
-)
-IF NOT DEFINED jvm (
-  echo expect 'jvm' as environment variable for production runs
-  exit 1
-)
-IF NOT DEFINED testedPlatform (
-  echo expect 'testedPlatform' as environment variable for production runs
-  exit 1
-)
-
-IF NOT DEFINED eclipseArch SET eclipseArch=x86_64
-
-@echo on
-ECHO === properties in testAll.bat
-ECHO     DOWNLOAD_HOST: %DOWNLOAD_HOST%
-ECHO     jvm in testAll: %jvm%
-ECHO     propertyFile in testAll: %propertyFile%
-ECHO     buildId in testAll: %buildId%
-ECHO     testedPlatform: %testedPlatform%
-ECHO     ANT_OPTS: %ANT_OPTS%
-
-mkdir results\consolelogs
-
-set consolelogs=results\consolelogs\%testedPlatform%_consolelog.txt
-
-runtests.bat -os win32 -ws win32 -arch %eclipseArch% -vm "%jvm%" -properties %propertyFile% %* > %consolelogs%
-
-:END
diff --git a/production/testScripts/runTests2.xml b/production/testScripts/runTests2.xml
index ecc4a8d0282..34b584c2e32 100644
--- a/production/testScripts/runTests2.xml
+++ b/production/testScripts/runTests2.xml
@@ -816,15 +816,18 @@
     depends="init"
     unless="env.TESTING_TEST_XML">
 
+    <mkdir dir="results/consolelogs"/>
+    <chmod file="${testScript}" perm="755"/>
     <!--run the tests -->
     <exec
       dir="${executionDir}"
-      executable="${testExecutable}">
+      executable="${testExecutable}"
+      output="results/consolelogs/${testedPlatform}_consolelog.txt">
       <arg line="${executionArguments}" />
+      <arg line="-os ${osgi.os} -ws ${osgi.ws} -arch ${osgi.arch}"/>
+      <arg value="-vm"/><arg path="${jvm}"/>
+      <arg value="-properties"/><arg path="${WORKSPACE}/production.properties"/>
       <arg value="${testSuite}" />
-      <env
-        key="propertyFile"
-        file="${WORKSPACE}/production.properties" />
       <env
         key="jvm"
         file="${jvm}" />