diff --git a/bom-internal/pom.xml b/bom-internal/pom.xml
index b52eb30e45d0..84e4ee50d708 100644
--- a/bom-internal/pom.xml
+++ b/bom-internal/pom.xml
@@ -324,7 +324,7 @@
             </dependency>
             <dependency>
                 <groupId>com.github.tomakehurst</groupId>
-                <artifactId>wiremock-jre8</artifactId>
+                <artifactId>wiremock-jre8-standalone</artifactId>
                 <version>${wiremock.version}</version>
                 <scope>test</scope>
             </dependency>
diff --git a/core/auth-crt/pom.xml b/core/auth-crt/pom.xml
index 465b614151e7..b76e1d6007b9 100644
--- a/core/auth-crt/pom.xml
+++ b/core/auth-crt/pom.xml
@@ -92,7 +92,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/auth/pom.xml b/core/auth/pom.xml
index 33aca5922721..ee8af1833160 100644
--- a/core/auth/pom.xml
+++ b/core/auth/pom.xml
@@ -115,7 +115,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/aws-core/pom.xml b/core/aws-core/pom.xml
index e61d5fd0ac88..5201d20cf45b 100644
--- a/core/aws-core/pom.xml
+++ b/core/aws-core/pom.xml
@@ -152,7 +152,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/imds/pom.xml b/core/imds/pom.xml
index 6daa1780aa1b..48b53cfc39d6 100644
--- a/core/imds/pom.xml
+++ b/core/imds/pom.xml
@@ -97,7 +97,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/metrics-spi/pom.xml b/core/metrics-spi/pom.xml
index 5ed7ae30c24d..11a2f71cdc1c 100644
--- a/core/metrics-spi/pom.xml
+++ b/core/metrics-spi/pom.xml
@@ -44,7 +44,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/regions/pom.xml b/core/regions/pom.xml
index 78878d2b9f2d..992e408ba21e 100644
--- a/core/regions/pom.xml
+++ b/core/regions/pom.xml
@@ -75,7 +75,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/sdk-core/pom.xml b/core/sdk-core/pom.xml
index bd7b1d96236a..e0791b59e7ee 100644
--- a/core/sdk-core/pom.xml
+++ b/core/sdk-core/pom.xml
@@ -124,7 +124,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/http-clients/apache-client/pom.xml b/http-clients/apache-client/pom.xml
index 40db956028ed..fbbd8561d5b6 100644
--- a/http-clients/apache-client/pom.xml
+++ b/http-clients/apache-client/pom.xml
@@ -89,7 +89,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>test</scope>
         </dependency>
 
diff --git a/http-clients/apache5-client/pom.xml b/http-clients/apache5-client/pom.xml
index 914dcc4921b3..f44820b0f729 100644
--- a/http-clients/apache5-client/pom.xml
+++ b/http-clients/apache5-client/pom.xml
@@ -110,7 +110,7 @@
     </dependency>
     <dependency>
         <groupId>com.github.tomakehurst</groupId>
-        <artifactId>wiremock-jre8</artifactId>
+        <artifactId>wiremock-jre8-standalone</artifactId>
         <scope>test</scope>
     </dependency>
 </dependencies>
diff --git a/http-clients/aws-crt-client/pom.xml b/http-clients/aws-crt-client/pom.xml
index 972312cf6b08..87fe44170af5 100644
--- a/http-clients/aws-crt-client/pom.xml
+++ b/http-clients/aws-crt-client/pom.xml
@@ -84,7 +84,7 @@
         <!--Test Dependencies-->
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/http-clients/netty-nio-client/pom.xml b/http-clients/netty-nio-client/pom.xml
index 0187935429c0..c4fcee6ff0ee 100644
--- a/http-clients/netty-nio-client/pom.xml
+++ b/http-clients/netty-nio-client/pom.xml
@@ -114,7 +114,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -197,6 +197,26 @@
             <artifactId>jetty-alpn-server</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-alpn-java-server</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-alpn-openjdk8-server</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-alpn-java-client</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-alpn-openjdk8-client</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.jetty.http2</groupId>
             <artifactId>http2-common</artifactId>
diff --git a/http-clients/url-connection-client/pom.xml b/http-clients/url-connection-client/pom.xml
index a47ca47143ad..32e8ad268af3 100644
--- a/http-clients/url-connection-client/pom.xml
+++ b/http-clients/url-connection-client/pom.xml
@@ -105,7 +105,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/metric-publishers/pom.xml b/metric-publishers/pom.xml
index 73de8b0b0800..23425c2db445 100644
--- a/metric-publishers/pom.xml
+++ b/metric-publishers/pom.xml
@@ -99,7 +99,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <groupId>com.github.tomakehurst</groupId>
             <scope>test</scope>
         </dependency>
diff --git a/services-custom/dynamodb-enhanced/pom.xml b/services-custom/dynamodb-enhanced/pom.xml
index 733f00b6dec0..0a6a8596e6d6 100644
--- a/services-custom/dynamodb-enhanced/pom.xml
+++ b/services-custom/dynamodb-enhanced/pom.xml
@@ -190,7 +190,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/services-custom/s3-transfer-manager/pom.xml b/services-custom/s3-transfer-manager/pom.xml
index ebb37e1432eb..9c4d76ac6c8c 100644
--- a/services-custom/s3-transfer-manager/pom.xml
+++ b/services-custom/s3-transfer-manager/pom.xml
@@ -217,7 +217,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <groupId>com.github.tomakehurst</groupId>
             <scope>test</scope>
         </dependency>
diff --git a/services/pom.xml b/services/pom.xml
index 015815be8ee3..10e6d7e5ee71 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -594,7 +594,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <groupId>com.github.tomakehurst</groupId>
             <scope>test</scope>
         </dependency>
diff --git a/services/s3/pom.xml b/services/s3/pom.xml
index f0a365a33f9a..56976ed27b6c 100644
--- a/services/s3/pom.xml
+++ b/services/s3/pom.xml
@@ -171,7 +171,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/ContentLengthMismatchTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/ContentLengthMismatchTest.java
index 6bde6763c7bb..38a5bbc9cc8e 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/ContentLengthMismatchTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/ContentLengthMismatchTest.java
@@ -24,7 +24,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import com.github.tomakehurst.wiremock.junit5.WireMockTest;
 import com.github.tomakehurst.wiremock.matching.MatchResult;
@@ -47,6 +46,7 @@
 import software.amazon.awssdk.services.s3.S3AsyncClient;
 import software.amazon.awssdk.services.s3.S3AsyncClientBuilder;
 import software.amazon.awssdk.services.s3.model.PutObjectResponse;
+import wiremock.com.fasterxml.jackson.annotation.JsonProperty;
 
 @WireMockTest
 public class ContentLengthMismatchTest {
diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/UseGlobalEndpointResolverTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/UseGlobalEndpointResolverTest.java
index e1121fb3aa97..34c84939c798 100644
--- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/UseGlobalEndpointResolverTest.java
+++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/endpoints/UseGlobalEndpointResolverTest.java
@@ -17,14 +17,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.io.ByteArrayInputStream;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.function.Supplier;
-import org.apache.hc.core5.http.Chars;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -36,7 +32,6 @@
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.regions.ServiceMetadataAdvancedOption;
 import software.amazon.awssdk.testutils.EnvironmentVariableHelper;
-import software.amazon.awssdk.utils.StringInputStream;
 import software.amazon.awssdk.utils.Validate;
 
 @RunWith(Parameterized.class)
diff --git a/test/auth-tests/pom.xml b/test/auth-tests/pom.xml
index c20d3b319704..afdf128cedfa 100644
--- a/test/auth-tests/pom.xml
+++ b/test/auth-tests/pom.xml
@@ -129,7 +129,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/test/codegen-generated-classes-test/pom.xml b/test/codegen-generated-classes-test/pom.xml
index 68dd0e843582..609844f7760d 100644
--- a/test/codegen-generated-classes-test/pom.xml
+++ b/test/codegen-generated-classes-test/pom.xml
@@ -175,7 +175,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/BlockingAsyncRequestResponseBodyResourceManagementTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/BlockingAsyncRequestResponseBodyResourceManagementTest.java
index 7818c3140b2e..b4678089d7e5 100644
--- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/BlockingAsyncRequestResponseBodyResourceManagementTest.java
+++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/BlockingAsyncRequestResponseBodyResourceManagementTest.java
@@ -44,14 +44,12 @@
 import java.io.IOException;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Consumer;
-import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang.RandomStringUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/paginators/PaginatorsTest.java b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/paginators/PaginatorsTest.java
index 9c7a6f4a8b52..615c8cb75a0c 100644
--- a/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/paginators/PaginatorsTest.java
+++ b/test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/paginators/PaginatorsTest.java
@@ -20,13 +20,13 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
 import io.reactivex.Flowable;
+import java.io.IOException;
 import java.net.URI;
 import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.AfterAll;
@@ -66,7 +66,7 @@ static void teardown() {
     void listStrings_largePage_succeeds() {
         int nItems = 10_000;
         wireMock.stubFor(post(urlEqualTo("/2016-03-11/listStrings")).willReturn(
-            aResponse().withStatus(200).withJsonBody(createResponse(nItems))));
+            aResponse().withStatus(200).withBody(createResponse(nItems))));
 
         ListStringsPublisher publisher = client.listStringsPaginator(ListStringsRequest.builder().build());
 
@@ -74,7 +74,7 @@ void listStrings_largePage_succeeds() {
         assertThat(itemsSeen).isEqualTo(nItems);
     }
 
-    private static JsonNode createResponse(int nItems) {
+    private static String createResponse(int nItems) {
         ObjectNode resp = mapper.createObjectNode();
 
         ArrayNode strings = mapper.createArrayNode();
@@ -84,6 +84,10 @@ private static JsonNode createResponse(int nItems) {
 
         resp.set("Strings", strings);
 
-        return resp;
+        try {
+            return mapper.writeValueAsString(resp);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 }
diff --git a/test/crt-unavailable-tests/pom.xml b/test/crt-unavailable-tests/pom.xml
index d5f0e803488b..01ff372ea6c2 100644
--- a/test/crt-unavailable-tests/pom.xml
+++ b/test/crt-unavailable-tests/pom.xml
@@ -78,7 +78,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/test/http-client-tests/pom.xml b/test/http-client-tests/pom.xml
index 21428de1d9bf..599c376de474 100644
--- a/test/http-client-tests/pom.xml
+++ b/test/http-client-tests/pom.xml
@@ -85,7 +85,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/test/old-client-version-compatibility-test/pom.xml b/test/old-client-version-compatibility-test/pom.xml
index b12e6b3f96ec..b72d25bcf847 100644
--- a/test/old-client-version-compatibility-test/pom.xml
+++ b/test/old-client-version-compatibility-test/pom.xml
@@ -119,7 +119,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/test/protocol-tests-core/pom.xml b/test/protocol-tests-core/pom.xml
index 0f409324060b..437a17d8e956 100644
--- a/test/protocol-tests-core/pom.xml
+++ b/test/protocol-tests-core/pom.xml
@@ -97,7 +97,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/test/protocol-tests/pom.xml b/test/protocol-tests/pom.xml
index 550e89fb1a0e..9023bba45e83 100644
--- a/test/protocol-tests/pom.xml
+++ b/test/protocol-tests/pom.xml
@@ -215,7 +215,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/test/stability-tests/pom.xml b/test/stability-tests/pom.xml
index 69ac9624fb99..427a37eeaa03 100644
--- a/test/stability-tests/pom.xml
+++ b/test/stability-tests/pom.xml
@@ -194,7 +194,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <artifactId>wiremock-jre8-standalone</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>