diff --git a/Jenkinsfile b/Jenkinsfile
index 2491a8b661..41472bba89 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -46,7 +46,6 @@ def generateCTSStage(job) {
               sh """
                 env
                 unzip -q -o ${WORKSPACE}/jakartaeetck-bundles/*jakartaeetck*.zip -d ${CTS_HOME}
-                bash -x ${CTS_HOME}/jakartaeetck/docker/fix_classpaths.sh 2>&1 | tee ${CTS_HOME}/fix_classpaths.log
                 bash -x ${CTS_HOME}/jakartaeetck/docker/run_jakartaeetck.sh ${job} 2>&1 | tee ${CTS_HOME}/run_jakartaeetck.log
               """
               archiveArtifacts artifacts: "*-results.tar.gz,*-junitreports.tar.gz", allowEmptyArchive: true
@@ -66,7 +65,6 @@ def generateCTSStage(job) {
               sh """
                 env
                 unzip -q -o ${WORKSPACE}/jakartaeetck-bundles/*jakartaeetck*.zip -d ${CTS_HOME}
-                bash -x ${CTS_HOME}/jakartaeetck/docker/fix_classpaths.sh 2>&1 | tee ${CTS_HOME}/fix_classpaths.log
                 bash -x ${CTS_HOME}/jakartaeetck/docker/run_jakartaeetck.sh ${job} 2>&1 | tee ${CTS_HOME}/run_cts.log
               """
               archiveArtifacts artifacts: "*-results.tar.gz,*-junitreports.tar.gz", allowEmptyArchive: true
diff --git a/docker/build_jakartaeetck.sh b/docker/build_jakartaeetck.sh
index 1bb15836e8..76f3f0a75f 100755
--- a/docker/build_jakartaeetck.sh
+++ b/docker/build_jakartaeetck.sh
@@ -52,7 +52,6 @@ if [ ! -z "$TCK_BUNDLE_BASE_URL" ]; then
      cp -R docker jakartaeetck
      zip -u ${WORKSPACE}/jakartaeetck-bundles/jakartaeetck.zip jakartaeetck/docker/run_jakartaeetck.sh
      zip -u ${WORKSPACE}/jakartaeetck-bundles/jakartaeetck.zip jakartaeetck/docker/build_jakartaeetck.sh
-     zip -u ${WORKSPACE}/jakartaeetck-bundles/jakartaeetck.zip jakartaeetck/docker/fix_classpaths.sh
      zip -u ${WORKSPACE}/jakartaeetck-bundles/jakartaeetck.zip jakartaeetck/docker/JTReportParser/JTReportParser.jar
      rm -rf jakartaeetck
    fi
diff --git a/docker/fix_classpaths.sh b/docker/fix_classpaths.sh
deleted file mode 100755
index cc09965cc4..0000000000
--- a/docker/fix_classpaths.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash -x
-sed -i 's/javax.annotation.jar/jakarta.annotation-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/jaxb-api.jar/jakarta.xml.bind-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.annotation-api.jar/jakarta.annotation-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.ejb-api.jar/jakarta.ejb-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.el.jar/jakarta.el.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.enterprise.concurrent-api.jar/jakarta.enterprise.concurrent-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.enterprise.concurrent.jar/jakarta.enterprise.concurrent.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.faces.jar/jakarta.faces.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.inject.jar/jakarta.inject.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.interceptor-api.jar/jakarta.interceptor-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.jms-api.jar/jakarta.jms-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.json.bind-api.jar/jakarta.json.bind-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.json.jar/jakarta.json.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.json-api.jar/jakarta.json.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.mail.jar/jakarta.mail.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.persistence.jar/jakarta.persistence.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.resource-api.jar/jakarta.resource-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.security.auth.message-api.jar/jakarta.security.auth.message-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.security.enterprise-api.jar/jakarta.security.enterprise-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.security.enterprise.jar/jakarta.security.enterprise.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.security.jacc-api.jar/jakarta.security.jacc-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.servlet-api.jar/jakarta.servlet-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.servlet.jsp-api.jar/jakarta.servlet.jsp-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.servlet.jsp.jstl-api.jar/jakarta.servlet.jsp.jstl-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.transaction-api.jar/jakarta.transaction-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.websocket-api.jar/jakarta.websocket-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.xml.registry-api.jar/jakarta.xml.registry-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-sed -i 's/javax.ws.rs-api.jar/jakarta.ws.rs-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
-
-echo "Fixed classpath properties in ts.jte successfully."
diff --git a/docker/jaxrstck.sh b/docker/jaxrstck.sh
deleted file mode 100755
index 9ad1fd8441..0000000000
--- a/docker/jaxrstck.sh
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/bin/bash -xe
-
-# Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0, which is available at
-# http://www.eclipse.org/legal/epl-2.0.
-#
-# This Source Code may also be made available under the following Secondary
-# Licenses when the conditions for such availability set forth in the
-# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-# version 2 with the GNU Classpath Exception, which is available at
-# https://www.gnu.org/software/classpath/license.html.
-#
-# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
-export TCK_HOME=${WORKSPACE}
-
-echo "TCK_HOME in jaxrstck.sh $TCK_HOME"
-echo "ANT_HOME in jaxrstck.sh $ANT_HOME"
-echo "PATH in jaxrstck.sh $PATH"
-echo "ANT_OPTS in jaxrstck.sh $ANT_OPTS"
-
-cd $TCK_HOME
-if ls ${WORKSPACE}/standalone-bundles/*jaxrstck*.zip 1> /dev/null 2>&1; then
-  echo "Using stashed bundle for jaxrstck created during the build phase"
-  unzip -q ${WORKSPACE}/standalone-bundles/*jaxrstck*.zip -d ${TCK_HOME}
-  TCK_NAME=jaxrstck
-elif ls ${WORKSPACE}/standalone-bundles/*restful-ws-tck*.zip 1> /dev/null 2>&1; then
-  echo "Using stashed bundle for restful-ws-tck created during the build phase"
-  unzip -q ${WORKSPACE}/standalone-bundles/*restful-ws-tck*.zip -d ${TCK_HOME}
-  TCK_NAME=restful-ws-tck
-else
-  echo "[ERROR] TCK bundle not found"
-  exit 1
-fi
-
-if [ -z "$GF_TOPLEVEL_DIR" ]; then
-  export GF_TOPLEVEL_DIR=glassfish7
-fi
-
-##### installRI.sh starts here #####
-echo "Download and install GlassFish 7.0.0 ..."
-if [ -z "${GF_BUNDLE_URL}" ]; then
-  echo "[ERROR] GF_BUNDLE_URL not set"
-  exit 1
-fi
-wget --progress=bar:force --no-cache $GF_BUNDLE_URL -O latest-glassfish.zip
-unzip -q ${TCK_HOME}/latest-glassfish.zip -d ${TCK_HOME}
-
-TS_HOME=$TCK_HOME/$TCK_NAME
-echo "TS_HOME $TS_HOME"
-
-chmod -R 777 $TS_HOME
-cd $TS_HOME/bin
-
-if [[ "$JDK" == "JDK17" || "$JDK" == "jdk17" ]];then
-  export JAVA_HOME=${JDK17_HOME}
-fi
-export PATH=$JAVA_HOME/bin:$PATH
-
-which java
-java -version
-
-sed -i "s#^web.home=.*#web.home=$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish#g" ts.jte
-sed -i "s#^report.dir=.*#report.dir=$TCK_HOME/${TCK_NAME}report/${TCK_NAME}#g" ts.jte
-sed -i "s#^work.dir=.*#work.dir=$TCK_HOME/${TCK_NAME}work/${TCK_NAME}#g" ts.jte
-sed -i "s#^impl.vi=.*#impl.vi=glassfish#g" ts.jte
-sed -i 's#jaxrs_impl\.classes=.*#jaxrs_impl.classes=${web.home}/modules/jakarta.json.jar:${web.home}/modules/jakarta.json.bind-api.jar:${web.home}/modules/jakarta.json.jar:${web.home}/modules/jsonp-jaxrs.jar:${web.home}/modules/jersey-client.jar:${web.home}/modules/jersey-common.jar:${web.home}/modules/jersey-server.jar:${web.home}/modules/jersey-container-servlet.jar:${web.home}/modules/jersey-container-servlet-core.jar:${web.home}/modules/jersey-media-jaxb.jar:${web.home}/modules/jersey-media-sse.jar:${web.home}/modules/jersey-hk2.jar:${web.home}/modules/osgi-resource-locator.jar:${web.home}/modules/jakarta.inject-api.jar:${web.home}/modules/guava.jar:${web.home}/modules/hk2-api.jar:${web.home}/modules/hk2-locator.jar:${web.home}/modules/hk2-utils.jar:${web.home}/modules/javassist.jar:${web.home}/modules/cglib.jar:${web.home}/modules/jakarta.annotation-api.jar:${web.home}/modules/jakarta.xml.bind-api.jar:${web.home}/modules/jakarta.activation-api.jar#g' ts.jte
-sed -i 's#jaxrs_impl_lib=.*#jaxrs_impl_lib=${web.home}/modules/jersey-container-servlet-core.jar#g' ts.jte
-sed -i 's#jaxrs\.classes=.*#jaxrs.classes=${web.home}/modules/jakarta.ws.rs-api.jar#g' ts.jte
-sed -i 's#servlet_adaptor=.*#servlet_adaptor=org\/glassfish\/jersey\/servlet\/ServletContainer.class#g' ts.jte
-sed -i 's#servlet.classes=.*#servlet.classes=${web.home}/modules/jakarta.servlet-api.jar#g' ts.jte
-sed -i 's#jaxrs_impl_name=.*#jaxrs_impl_name=jersey#g' ts.jte
-sed -i 's#webServerHost=.*#webServerHost=localhost#g' ts.jte
-sed -i 's#webServerPort=.*#webServerPort=8080#g' ts.jte
-sed -i 's#impl\.vi\.deploy\.dir=.*#impl.vi.deploy.dir=${web.home}/domains/domain1/autodeploy#g' ts.jte
-
-if [[ "$PROFILE" == "web" || "$PROFILE" == "WEB" ]]; then
-  echo "javaee.level=web"  >> ts.jte
-fi
-
-mkdir -p $TCK_HOME/${TCK_NAME}report/${TCK_NAME}
-mkdir -p $TCK_HOME/${TCK_NAME}work/${TCK_NAME}
-
-if [ ! -z "$USER_KEYWORDS" ]; then
-    TCK_KEYWORDS="${USER_KEYWORDS}"
-elif [ ! -z "$KEYWORDS" ]; then
-    TCK_KEYWORDS="${KEYWORDS}"
-else
-    TCK_KEYWORDS="jaxrs"
-fi
-
-echo "KEYWORDS:${TCK_KEYWORDS}"
-cd $TS_HOME/bin
-ant config.vi
-cd $TS_HOME/bin
-ant deploy.all
-
-cd $TS_HOME/src/com/sun/ts/tests/
-ant runclient -Dkeywords=\"${TCK_KEYWORDS}\"
-echo "Test run complete"
-
-JT_REPORT_DIR=$TCK_HOME/${TCK_NAME}report
-export HOST=`hostname -f`
-echo "1 ${TCK_NAME} ${HOST}" > ${WORKSPACE}/args.txt
-mkdir -p ${WORKSPACE}/results/junitreports/
-${JAVA_HOME}/bin/java -Djunit.embed.sysout=true -jar ${WORKSPACE}/docker/JTReportParser/JTReportParser.jar ${WORKSPACE}/args.txt ${JT_REPORT_DIR} ${WORKSPACE}/results/junitreports/
-
-tar zcvf ${WORKSPACE}/${TCK_NAME}-results.tar.gz ${TCK_HOME}/${TCK_NAME}report ${TCK_HOME}/${TCK_NAME}work ${WORKSPACE}/results/junitreports/ ${TCK_HOME}/$GF_TOPLEVEL_DIR/glassfish/domains/domain1 $TCK_HOME/$TCK_NAME/bin/ts.*