diff --git a/jaxrs-tck-docs/JAXRSTCK3.1-ReleaseNotes.html b/jaxrs-tck-docs/JAXRSTCK3.1-ReleaseNotes.html
index fd023da..03aafff 100644
--- a/jaxrs-tck-docs/JAXRSTCK3.1-ReleaseNotes.html
+++ b/jaxrs-tck-docs/JAXRSTCK3.1-ReleaseNotes.html
@@ -29,11 +29,11 @@
     <div align="center">
       <h1>Jakarta EE RESTful Web Services Technology Compatibility
         Kit, Version 3.1<br>
-        <span class="emphasize">Release Notes, January 2022</span></h1>
+        <span class="emphasize">Release Notes, March 2022</span></h1>
     </div>
     <hr size="3">
     <h2>Release Notes Update For Eclipse Jersey 3.1.0 Compatible Implementation
-      Release January 2022 </h2>
+      Release March 2022 </h2>
     <p> A couple of changes made in Eclipse Jersey 3.1.0 Compatible
       Implementation (CI) prompts this note. </p>
     <ul>
@@ -74,7 +74,7 @@
     <h2>Jakarta EE RESTful Web Services 3.1 TCK Facts</h2>
     <p>The test suite bundle contains the following:</p>
     <ul>
-      <li>2795 total tests</li>
+      <li>2796 total tests</li>
     </ul>
     <hr>
     <h2>Platform Notes</h2>
@@ -121,7 +121,7 @@
    
     <p><small> </small></p>
     <small>
-      <address> Copyright � 2009, 2021 Oracle and/or its affiliates. All rights
+      <address> Copyright � 2009, 2022 Oracle and/or its affiliates. All rights
         reserved. </address>
     </small>
     <p></p>
diff --git a/jaxrs-tck-docs/TCK-Exclude-List.txt b/jaxrs-tck-docs/TCK-Exclude-List.txt
index 235fde2..718fe44 100644
--- a/jaxrs-tck-docs/TCK-Exclude-List.txt
+++ b/jaxrs-tck-docs/TCK-Exclude-List.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2021, 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
@@ -18,65 +18,67 @@
 # This is intended only for documentation purpose and is not used to exclude any tests.
 # The tests are excluded from the test source using @Disabled tag in JUnit framework.
 #
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#deleteTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#deleteWithCallbackStringWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#deleteWithCallbackWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#deleteWithGenericTypeResponseWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#deleteWithGenericTypeStringWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#deleteWithResponseClassWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#deleteWithStringClassWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#getTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#getWithCallbackStringWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#getWithCallbackWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#getWithGenericTypeResponseWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#getWithGenericTypeStringWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#getWithResponseClassWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#getWithStringClassWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#headTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#headWithCallbackWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithCallbackStringWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithCallbackStringWithEntityWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithCallbackWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithCallbackWithEntityWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithEntityWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithGenericTypeResponseWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithGenericTypeResponseWithEntityWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithGenericTypeStringWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithGenericTypeStringWithEntityWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithResponseClassWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithResponseClassWithEntityWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithStringClassWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#methodWithStringClassWithEntityWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#optionsTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#optionsWithCallbackWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#optionsWithGenericTypeResponseWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#optionsWithGenericTypeStringWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#optionsWithResponseClassWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#optionsWithStringCallbackWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#optionsWithStringClassWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#postTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#postWithCallbackWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#postWithGenericTypeResponseWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#postWithGenericTypeStringWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#postWithResponseClassWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#postWithStringClassWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#putTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#putWithCallbackWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#putWithGenericTypeResponseWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#putWithGenericTypeStringWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#putWithResponseClassWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#putWithStringCallbackWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#putWithStringClassWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#traceTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#traceWithCallbackWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#traceWithGenericTypeResponseWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#traceWithGenericTypeStringWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#traceWithResponseClassWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#traceWithStringCallbackWhileServerWaitTest
-ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClient.java#traceWithStringClassWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#deleteTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#deleteWithCallbackStringWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#deleteWithCallbackWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#deleteWithGenericTypeResponseWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#deleteWithGenericTypeStringWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#deleteWithResponseClassWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#deleteWithStringClassWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#getTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#getWithCallbackStringWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#getWithCallbackWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#getWithGenericTypeResponseWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#getWithGenericTypeStringWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#getWithResponseClassWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#getWithStringClassWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#headTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#headWithCallbackWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#methodTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#methodWithCallbackStringWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#methodWithCallbackStringWithEntityWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#methodWithCallbackWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#methodWithCallbackWithEntityWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#methodWithEntityWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#methodWithGenericTypeResponseWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#methodWithGenericTypeResponseWithEntityWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#methodWithGenericTypeStringWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#methodWithGenericTypeStringWithEntityWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#methodWithResponseClassWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#methodWithResponseClassWithEntityWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#methodWithStringClassWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#methodWithStringClassWithEntityWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#optionsTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#optionsWithCallbackWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#optionsWithGenericTypeResponseWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#optionsWithGenericTypeStringWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#optionsWithResponseClassWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#optionsWithStringCallbackWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#optionsWithStringClassWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#postTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#postWithCallbackWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#postWithGenericTypeResponseWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#postWithGenericTypeStringWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#postWithResponseClassWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#postWithStringClassWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#putTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#putWithCallbackWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#putWithGenericTypeResponseWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#putWithGenericTypeStringWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#putWithResponseClassWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#putWithStringCallbackWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#putWithStringClassWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#traceTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#traceWithCallbackWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#traceWithGenericTypeResponseWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#traceWithGenericTypeStringWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#traceWithResponseClassWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#traceWithStringCallbackWhileServerWaitTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/client/executor/async/JAXRSClientIT.java#traceWithStringClassWhileServerWaitTest
 
 #
 #
-ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/sseeventsource/JAXRSClient.java#connectionLostForDefault500msTest
+ee/jakarta/tck/ws/rs/jaxrs21/ee/sse/sseeventsource/JAXRSClientIT.java#connectionLostForDefault500msTest
 
+# https://github.com/jakartaee/rest/issues/1106
+ee/jakarta/tck/ws/rs/api/rs/core/uribuilder/JAXRSClientIT.java#replaceQueryTest4
diff --git a/jaxrs-tck-docs/userguide/src/main/jbake/content/attributes.conf b/jaxrs-tck-docs/userguide/src/main/jbake/content/attributes.conf
index d17e60b..3c55e82 100644
--- a/jaxrs-tck-docs/userguide/src/main/jbake/content/attributes.conf
+++ b/jaxrs-tck-docs/userguide/src/main/jbake/content/attributes.conf
@@ -3,7 +3,7 @@
 :LegacyAcronym: JAX-RS	   
 :TechnologyVersion: 3.1
 :TechnologyRI: Eclipse Jersey 3.1
-:ReleaseDate: January 2022
+:ReleaseDate: March 2022
 :CopyrightDates: 2017, 2022
 :TechnologyRIURL: https://projects.eclipse.org/projects/ee4j.jersey
 :SpecificationURL: https://jakarta.ee/specifications/restful-ws/3.1/
diff --git a/jaxrs-tck-docs/userguide/src/main/jbake/content/debug.adoc b/jaxrs-tck-docs/userguide/src/main/jbake/content/debug.adoc
index 9f88e98..0227fb1 100644
--- a/jaxrs-tck-docs/userguide/src/main/jbake/content/debug.adoc
+++ b/jaxrs-tck-docs/userguide/src/main/jbake/content/debug.adoc
@@ -63,23 +63,8 @@
 6.2 Test Information
 ~~~~~~~~~~~~~~~~~~~~
 
-To display information about a test in the JavaTest GUI, click its icon
-in the test tree or double-click its name in a folder status tab. The
-tab contains detailed information about the test run and, at the bottom
-of the window, a brief status message identifying the type of failure or
-error. This message may be sufficient for you to identify the cause of
-the error or failure.
-
 If you need more information to identify the cause of the error or
-failure, use the following tabs listed in order of importance:
-
-* Test Run Messages contains a Message list and a Message section that
-display the messages produced during the test run.
-* Test Run Details contains a two-column table of name/value pairs
-recorded when the test was run.
-* Configuration contains a two-column table of the test environment
-name/value pairs derived from the configuration data actually used to
-run the test.
+failure, use the Junit reports generated after running the tests.
 
 
 [[GBFYF]][[configuration-failures]]
diff --git a/jaxrs-tck-docs/userguide/src/main/jbake/content/intro.adoc b/jaxrs-tck-docs/userguide/src/main/jbake/content/intro.adoc
index f2e6bf5..642ad45 100644
--- a/jaxrs-tck-docs/userguide/src/main/jbake/content/intro.adoc
+++ b/jaxrs-tck-docs/userguide/src/main/jbake/content/intro.adoc
@@ -290,7 +290,7 @@
 guide.
 
 1.  Make sure that the following software has been correctly installed
-on the system hosting the JavaTest harness:
+on the system :
 include::req-software.inc[]
 * Java SE {SEversion}
 * A CI for {TechnologyShortName} {TechnologyVersion}. One example is {TechnologyRI}.
diff --git a/jaxrs-tck-docs/userguide/src/main/jbake/content/platforms.inc b/jaxrs-tck-docs/userguide/src/main/jbake/content/platforms.inc
index c1db9d9..5ee1a6c 100644
--- a/jaxrs-tck-docs/userguide/src/main/jbake/content/platforms.inc
+++ b/jaxrs-tck-docs/userguide/src/main/jbake/content/platforms.inc
@@ -1,2 +1,2 @@
 
-* CentOS Linux 7
\ No newline at end of file
+* Debian GNU/Linux 10
\ No newline at end of file
diff --git a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/uribuilder/JAXRSClientIT.java b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/uribuilder/JAXRSClientIT.java
index 87eec8b..d23920f 100644
--- a/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/uribuilder/JAXRSClientIT.java
+++ b/jaxrs-tck/src/main/java/ee/jakarta/tck/ws/rs/api/rs/core/uribuilder/JAXRSClientIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 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
@@ -36,7 +36,7 @@
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.AfterEach;
-
+import org.junit.jupiter.api.Disabled;
 
 /*
  * @class.setup_props: webServerHost;
@@ -1715,6 +1715,7 @@
    * IllegalArgumentException is thrown when query cannot be parsed.
    */
   @Test
+  @Disabled
   public void replaceQueryTest4() throws Fault {
     String value = "http://localhost:8080?name1=x&name2=%20&name3=x+y&name4=x%20y";