diff --git a/src/test/resources/ts.jtx b/src/test/resources/ts.jtx
index cefd02b..1b7a4e3 100644
--- a/src/test/resources/ts.jtx
+++ b/src/test/resources/ts.jtx
@@ -61,9 +61,26 @@
 ################
 
 #
-# Bug ID: 19815625
 #
-com/sun/ts/tests/servlet/api/javax_servlet_http/httpupgradehandler/URLClient.java#upgradeTest
+com/sun/ts/tests/servlet/api/jakarta_servlet_http/httpupgradehandler/URLClient.java#upgradeTest
+
+#
+# Excluding this test until we can merge https://github.com/eclipse-ee4j/jakartaee-tck/pull/558
+# TODO: In the next release after Jakarta EE 9 (perhaps Jakarta EE 9.1 or 10) the pull request will be merged and this exclude removed.
+com/sun/ts/tests/servlet/spec/security/secbasic/Client.java#test7
+com/sun/ts/tests/servlet/spec/security/secbasic/Client.java#test7_anno
+
+#
+# In response to accepted Platform TCK challenge servlet-api/issues/385 + https://github.com/eclipse-ee4j/jakartaee-tck/issues/594, exclude the following tests:
+#    com/sun/ts/tests/servlet/api/javax_servlet_http/httpservletrequest40/Client.java#httpServletMappingDispatchTest
+com/sun/ts/tests/servlet/api/javax_servlet_http/httpservletrequest40/Client.java#httpServletMappingDispatchTest
+
+#
+# In response to accepted challenge eclipse-ee4j/servlet-api#378 + https://github.com/eclipse-ee4j/jakartaee-tck/issues/593, exclude the following tests:
+#    com.sun.ts.tests.servlet.api.javax_servlet_http.cookie.URLClient#setMaxAgePositiveTest
+#    com.sun.ts.tests.servlet.pluggability.api.javax_servlet_http.cookie.URLClient#setMaxAgePositiveTest
+com/sun/ts/tests/servlet/api/javax_servlet_http/cookie/URLClient.java#setMaxAgePositiveTest
+com/sun/ts/tests/servlet/pluggability/api/javax_servlet_http/cookie/URLClient.java#setMaxAgePositiveTest
 
 
 ################
@@ -158,6 +175,11 @@
 com/sun/ts/tests/jaxrs/api/rs/core/linkbuilder/JAXRSClient.java#buildObjectsThrowsUriBuilderExceptionTest_from_servlet
 com/sun/ts/tests/jaxrs/api/rs/core/linkbuilder/JAXRSClient.java#buildRelativizedThrowsUriBuilderExceptionTest_from_servlet
 
+#
+# In response to accepted Platform TCK challenge jaxrs-api/issues/937, exclude the following test:
+#    com/sun/ts/tests/jaxrs/ee/rs/ext/providers/JAXRSProvidersClient.java#isRegisteredRuntimeExceptionExceptionMapperTest
+com/sun/ts/tests/jaxrs/ee/rs/ext/providers/JAXRSProvidersClient.java#isRegisteredRuntimeExceptionExceptionMapperTest_from_standalone
+
 ################
 # JPA
 ################
@@ -305,7 +327,6 @@
 ################
 
 #
-# Tests excluded for challenges 253074 and 250907
 #
 com/sun/ts/tests/securityapi/idstore/noidstore/Client.java#testIdentityStoreValidate_noIDStore
 com/sun/ts/tests/securityapi/ham/sam/delegation/Client.java#testSAMDelegatesHAM
@@ -313,3 +334,11 @@
 #
 # Tests excluded for https://github.com/eclipse-ee4j/jakartaee-platform/issues/139
 com/sun/ts/tests/securityapi/ham/sam/obtainbean/Client.java#testSAMObtainBean
+
+#
+# Web Socket 1.0 TCK Exclude List
+#
+
+# Issue https://github.com/eclipse-ee4j/websocket-api/issues/228
+com/sun/ts/tests/websocket/ee/jakarta/websocket/session/WSClient.java#getRequestURITest
+com/sun/ts/tests/websocket/spec/servercontainer/addendpoint/WSClient.java#getRequestURITest
\ No newline at end of file