diff --git a/archetypes/archetype-app-quickstart/src/main/resources/archetype-resources/pom.xml b/archetypes/archetype-app-quickstart/src/main/resources/archetype-resources/pom.xml
index 9954d3e42e45..020e0d3db7da 100644
--- a/archetypes/archetype-app-quickstart/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/archetype-app-quickstart/src/main/resources/archetype-resources/pom.xml
@@ -17,7 +17,7 @@
         <aws.java.sdk.version>${javaSdkVersion}</aws.java.sdk.version>
         <slf4j.version>1.7.28</slf4j.version>
         <graalvm.version>21.0.0</graalvm.version>
-        <junit5.version>5.8.1</junit5.version>
+        <junit5.version>5.4.2</junit5.version>
     </properties>
 
     <dependencyManagement>
diff --git a/archetypes/archetype-app-quickstart/src/test/resources/projects/apachehttpclient/reference/pom.xml b/archetypes/archetype-app-quickstart/src/test/resources/projects/apachehttpclient/reference/pom.xml
index 6995f4516a9e..8fb45458697e 100644
--- a/archetypes/archetype-app-quickstart/src/test/resources/projects/apachehttpclient/reference/pom.xml
+++ b/archetypes/archetype-app-quickstart/src/test/resources/projects/apachehttpclient/reference/pom.xml
@@ -16,7 +16,7 @@
         <aws.java.sdk.version>2.11.0</aws.java.sdk.version>
         <slf4j.version>1.7.28</slf4j.version>
         <graalvm.version>21.0.0</graalvm.version>
-        <junit5.version>5.8.1</junit5.version>
+        <junit5.version>5.4.2</junit5.version>
     </properties>
 
     <dependencyManagement>
diff --git a/archetypes/archetype-app-quickstart/src/test/resources/projects/apachehttpclientwithoutnativeimage/reference/pom.xml b/archetypes/archetype-app-quickstart/src/test/resources/projects/apachehttpclientwithoutnativeimage/reference/pom.xml
index 177d499a7619..abe47b27513e 100644
--- a/archetypes/archetype-app-quickstart/src/test/resources/projects/apachehttpclientwithoutnativeimage/reference/pom.xml
+++ b/archetypes/archetype-app-quickstart/src/test/resources/projects/apachehttpclientwithoutnativeimage/reference/pom.xml
@@ -16,7 +16,7 @@
         <aws.java.sdk.version>2.11.0</aws.java.sdk.version>
         <slf4j.version>1.7.28</slf4j.version>
         <graalvm.version>21.0.0</graalvm.version>
-        <junit5.version>5.8.1</junit5.version>
+        <junit5.version>5.4.2</junit5.version>
     </properties>
 
     <dependencyManagement>
diff --git a/archetypes/archetype-app-quickstart/src/test/resources/projects/nettyclient/reference/pom.xml b/archetypes/archetype-app-quickstart/src/test/resources/projects/nettyclient/reference/pom.xml
index 462a1e12a217..bd4ece385699 100644
--- a/archetypes/archetype-app-quickstart/src/test/resources/projects/nettyclient/reference/pom.xml
+++ b/archetypes/archetype-app-quickstart/src/test/resources/projects/nettyclient/reference/pom.xml
@@ -16,7 +16,7 @@
         <aws.java.sdk.version>2.11.0</aws.java.sdk.version>
         <slf4j.version>1.7.28</slf4j.version>
         <graalvm.version>21.0.0</graalvm.version>
-        <junit5.version>5.8.1</junit5.version>
+        <junit5.version>5.4.2</junit5.version>
     </properties>
 
     <dependencyManagement>
diff --git a/archetypes/archetype-app-quickstart/src/test/resources/projects/urlhttpclient/reference/pom.xml b/archetypes/archetype-app-quickstart/src/test/resources/projects/urlhttpclient/reference/pom.xml
index 0f8f1b67c441..7cf7cdd150ad 100644
--- a/archetypes/archetype-app-quickstart/src/test/resources/projects/urlhttpclient/reference/pom.xml
+++ b/archetypes/archetype-app-quickstart/src/test/resources/projects/urlhttpclient/reference/pom.xml
@@ -16,7 +16,7 @@
         <aws.java.sdk.version>2.11.0</aws.java.sdk.version>
         <slf4j.version>1.7.28</slf4j.version>
         <graalvm.version>21.0.0</graalvm.version>
-        <junit5.version>5.8.1</junit5.version>
+        <junit5.version>5.4.2</junit5.version>
     </properties>
 
     <dependencyManagement>
diff --git a/archetypes/archetype-lambda/src/main/resources/archetype-resources/pom.xml b/archetypes/archetype-lambda/src/main/resources/archetype-resources/pom.xml
index ea949b36505e..b51f5f667e6a 100644
--- a/archetypes/archetype-lambda/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/archetype-lambda/src/main/resources/archetype-resources/pom.xml
@@ -16,7 +16,7 @@
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <aws.java.sdk.version>${javaSdkVersion}</aws.java.sdk.version>
         <aws.lambda.java.version>1.2.0</aws.lambda.java.version>
-        <junit5.version>5.8.1</junit5.version>
+        <junit5.version>5.4.2</junit5.version>
 #if( $httpClient == 'netty-nio-client')
         <netty.openssl.version>${nettyOpenSslVersion}</netty.openssl.version>
 #end
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/pom.xml b/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/pom.xml
index 1d014a9d6909..d34684ea4c6d 100644
--- a/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/pom.xml
+++ b/archetypes/archetype-lambda/src/test/resources/projects/apachehttpclient/reference/pom.xml
@@ -15,7 +15,7 @@
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <aws.java.sdk.version>2.11.0</aws.java.sdk.version>
         <aws.lambda.java.version>1.2.0</aws.lambda.java.version>
-        <junit5.version>5.8.1</junit5.version>
+        <junit5.version>5.4.2</junit5.version>
     </properties>
 
     <dependencyManagement>
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/pom.xml b/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/pom.xml
index d670c5bf8f37..e434477f8aea 100644
--- a/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/pom.xml
+++ b/archetypes/archetype-lambda/src/test/resources/projects/dynamodbstreamsclient/reference/pom.xml
@@ -15,7 +15,7 @@
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <aws.java.sdk.version>2.11.0</aws.java.sdk.version>
         <aws.lambda.java.version>1.2.0</aws.lambda.java.version>
-        <junit5.version>5.8.1</junit5.version>
+        <junit5.version>5.4.2</junit5.version>
     </properties>
 
     <dependencyManagement>
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/pom.xml b/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/pom.xml
index d6c06d35cb44..177dfbb0440b 100644
--- a/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/pom.xml
+++ b/archetypes/archetype-lambda/src/test/resources/projects/nettyclient/reference/pom.xml
@@ -15,7 +15,7 @@
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <aws.java.sdk.version>2.11.0</aws.java.sdk.version>
         <aws.lambda.java.version>1.2.0</aws.lambda.java.version>
-        <junit5.version>5.8.1</junit5.version>
+        <junit5.version>5.4.2</junit5.version>
         <netty.openssl.version>2.0.29.Final</netty.openssl.version>
     </properties>
 
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/pom.xml b/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/pom.xml
index 006ec752f34b..510579f12687 100644
--- a/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/pom.xml
+++ b/archetypes/archetype-lambda/src/test/resources/projects/urlhttpclient/reference/pom.xml
@@ -15,7 +15,7 @@
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <aws.java.sdk.version>2.11.0</aws.java.sdk.version>
         <aws.lambda.java.version>1.2.0</aws.lambda.java.version>
-        <junit5.version>5.8.1</junit5.version>
+        <junit5.version>5.4.2</junit5.version>
     </properties>
 
     <dependencyManagement>
diff --git a/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/pom.xml b/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/pom.xml
index 3d609d4d9198..9394f5abb2cc 100644
--- a/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/pom.xml
+++ b/archetypes/archetype-lambda/src/test/resources/projects/wafregionalclient/reference/pom.xml
@@ -15,7 +15,7 @@
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <aws.java.sdk.version>2.11.0</aws.java.sdk.version>
         <aws.lambda.java.version>1.2.0</aws.lambda.java.version>
-        <junit5.version>5.8.1</junit5.version>
+        <junit5.version>5.4.2</junit5.version>
     </properties>
 
     <dependencyManagement>
diff --git a/bom-internal/pom.xml b/bom-internal/pom.xml
index ead1600c5d17..adf3580fe132 100644
--- a/bom-internal/pom.xml
+++ b/bom-internal/pom.xml
@@ -295,15 +295,9 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter</artifactId>
-                <version>${junit5.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.junit.vintage</groupId>
-                <artifactId>junit-vintage-engine</artifactId>
-                <version>${junit5.version}</version>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
diff --git a/codegen-lite/pom.xml b/codegen-lite/pom.xml
index 030364837b24..db09fe01916f 100644
--- a/codegen-lite/pom.xml
+++ b/codegen-lite/pom.xml
@@ -94,13 +94,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/codegen/pom.xml b/codegen/pom.xml
index 257748ba954f..727b46fde48f 100644
--- a/codegen/pom.xml
+++ b/codegen/pom.xml
@@ -156,13 +156,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <artifactId>junit</artifactId>
+            <groupId>junit</groupId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/arns/pom.xml b/core/arns/pom.xml
index 87fdfa5a9978..f66f1030a8d8 100644
--- a/core/arns/pom.xml
+++ b/core/arns/pom.xml
@@ -44,13 +44,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/auth-crt/pom.xml b/core/auth-crt/pom.xml
index 651b623b9bfb..894271901f16 100644
--- a/core/auth-crt/pom.xml
+++ b/core/auth-crt/pom.xml
@@ -69,13 +69,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/auth/pom.xml b/core/auth/pom.xml
index a27addfbf53f..fc807b025e2f 100644
--- a/core/auth/pom.xml
+++ b/core/auth/pom.xml
@@ -73,13 +73,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/aws-core/pom.xml b/core/aws-core/pom.xml
index 3c9fe33d0024..a29b24efe8c4 100644
--- a/core/aws-core/pom.xml
+++ b/core/aws-core/pom.xml
@@ -85,13 +85,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/json-utils/pom.xml b/core/json-utils/pom.xml
index 3c91737c5d66..e4eca88041fc 100644
--- a/core/json-utils/pom.xml
+++ b/core/json-utils/pom.xml
@@ -57,13 +57,8 @@
             <version>${awsjavasdk.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/metrics-spi/pom.xml b/core/metrics-spi/pom.xml
index 258b6b311df8..42961ed1ecf4 100644
--- a/core/metrics-spi/pom.xml
+++ b/core/metrics-spi/pom.xml
@@ -33,13 +33,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/protocols/aws-cbor-protocol/pom.xml b/core/protocols/aws-cbor-protocol/pom.xml
index 7c90719070ea..cf9f2ba5c942 100644
--- a/core/protocols/aws-cbor-protocol/pom.xml
+++ b/core/protocols/aws-cbor-protocol/pom.xml
@@ -57,13 +57,8 @@
             <version>${awsjavasdk.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/protocols/aws-json-protocol/pom.xml b/core/protocols/aws-json-protocol/pom.xml
index 3e35c120604d..9418e3b4da51 100644
--- a/core/protocols/aws-json-protocol/pom.xml
+++ b/core/protocols/aws-json-protocol/pom.xml
@@ -72,13 +72,8 @@
             <version>${awsjavasdk.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/protocols/aws-query-protocol/pom.xml b/core/protocols/aws-query-protocol/pom.xml
index 1447e235f383..57578cafe471 100644
--- a/core/protocols/aws-query-protocol/pom.xml
+++ b/core/protocols/aws-query-protocol/pom.xml
@@ -62,13 +62,8 @@
             <version>${awsjavasdk.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/protocols/aws-xml-protocol/pom.xml b/core/protocols/aws-xml-protocol/pom.xml
index 9b1e6159c010..7cd4d303b200 100644
--- a/core/protocols/aws-xml-protocol/pom.xml
+++ b/core/protocols/aws-xml-protocol/pom.xml
@@ -67,13 +67,8 @@
             <version>${awsjavasdk.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/protocols/protocol-core/pom.xml b/core/protocols/protocol-core/pom.xml
index 6f38df52eaf3..2f9ed6e4d1b5 100644
--- a/core/protocols/protocol-core/pom.xml
+++ b/core/protocols/protocol-core/pom.xml
@@ -53,13 +53,8 @@
             <version>${awsjavasdk.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/regions/pom.xml b/core/regions/pom.xml
index 76b21492241f..980d791d2161 100644
--- a/core/regions/pom.xml
+++ b/core/regions/pom.xml
@@ -64,13 +64,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/core/sdk-core/pom.xml b/core/sdk-core/pom.xml
index 0a92014f5f98..7b6d78fd6f71 100644
--- a/core/sdk-core/pom.xml
+++ b/core/sdk-core/pom.xml
@@ -72,13 +72,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/http-client-spi/pom.xml b/http-client-spi/pom.xml
index cfed3a130051..3f15b8e22a6a 100644
--- a/http-client-spi/pom.xml
+++ b/http-client-spi/pom.xml
@@ -61,13 +61,8 @@
             <version>${reactive-streams.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/http-clients/apache-client/pom.xml b/http-clients/apache-client/pom.xml
index 169c6b854876..f0a73a07f1e6 100644
--- a/http-clients/apache-client/pom.xml
+++ b/http-clients/apache-client/pom.xml
@@ -64,13 +64,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/http-clients/aws-crt-client/pom.xml b/http-clients/aws-crt-client/pom.xml
index 0a02a7227d26..56f56cf096aa 100644
--- a/http-clients/aws-crt-client/pom.xml
+++ b/http-clients/aws-crt-client/pom.xml
@@ -84,13 +84,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</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 66e399bf28d2..591070c91e13 100644
--- a/http-clients/netty-nio-client/pom.xml
+++ b/http-clients/netty-nio-client/pom.xml
@@ -119,13 +119,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/http-clients/url-connection-client/pom.xml b/http-clients/url-connection-client/pom.xml
index 9f93caa2dbdf..4aeef88531c0 100644
--- a/http-clients/url-connection-client/pom.xml
+++ b/http-clients/url-connection-client/pom.xml
@@ -51,13 +51,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/metric-publishers/cloudwatch-metric-publisher/src/test/java/software/amazon/awssdk/metrics/publishers/cloudwatch/CloudWatchMetricPublisherTest.java b/metric-publishers/cloudwatch-metric-publisher/src/test/java/software/amazon/awssdk/metrics/publishers/cloudwatch/CloudWatchMetricPublisherTest.java
index 1482c15a0a5a..d82aa1cc0ed0 100644
--- a/metric-publishers/cloudwatch-metric-publisher/src/test/java/software/amazon/awssdk/metrics/publishers/cloudwatch/CloudWatchMetricPublisherTest.java
+++ b/metric-publishers/cloudwatch-metric-publisher/src/test/java/software/amazon/awssdk/metrics/publishers/cloudwatch/CloudWatchMetricPublisherTest.java
@@ -74,7 +74,7 @@ public void interruptedShutdownStillTerminates() {
         Thread.currentThread().interrupt();
         publisher.close();
         assertThat(publisher.isShutdown()).isTrue();
-        Thread.interrupted(); // Clear interrupt flag
+        assertThat(Thread.interrupted()).isTrue(); // Clear interrupt flag
     }
 
     @Test
diff --git a/metric-publishers/pom.xml b/metric-publishers/pom.xml
index f8981dc5ed16..bf8a2acc61ea 100644
--- a/metric-publishers/pom.xml
+++ b/metric-publishers/pom.xml
@@ -52,13 +52,8 @@
             <version>${awsjavasdk.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/pom.xml b/pom.xml
index d8286e5c1680..2c757910098e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,8 @@
         <awscrt.version>0.15.8</awscrt.version>
 
         <!--Test dependencies -->
-        <junit5.version>5.8.1</junit5.version>
+        <junit.version>4.13.1</junit.version>
+        <junit5.version>5.7.1</junit5.version>
         <hamcrest.version>1.3</hamcrest.version>
         <mockito.version>1.10.19</mockito.version>
         <mockito2.version>2.28.2</mockito2.version>
@@ -131,10 +132,10 @@
         <sqllite.version>1.0.392</sqllite.version>
 
         <!-- build plugin dependencies-->
-        <maven.surefire.version>3.0.0-M5</maven.surefire.version>
+        <maven.surefire.version>2.22.2</maven.surefire.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
-        <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
+        <maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
         <maven-javadoc-plugin.version>3.0.1</maven-javadoc-plugin.version>
         <maven.build.timestamp.format>yyyy</maven.build.timestamp.format>
@@ -432,8 +433,6 @@
                     <ignoredUnusedDeclaredDependencies>
                         <!-- TODO: fix this when we've re-merged with netty-reactive-streams -->
                         <ignoredUnusedDeclaredDependency>com.typesafe.netty:*</ignoredUnusedDeclaredDependency>
-                        <ignoredUnusedDeclaredDependency>org.junit.jupiter:*</ignoredUnusedDeclaredDependency>
-                        <ignoredUnusedDeclaredDependency>org.junit.vintage:*</ignoredUnusedDeclaredDependency>
                         <ignoredUnusedDeclaredDependency>software.amazon.awssdk:aws-sdk-java</ignoredUnusedDeclaredDependency>
                         <!-- Declared by the codegen maven plugins (lite and normal). Not used directly but used to override a transitive dependecy -->
                         <ignoredUnusedDeclaredDependency>org.codehaus.plexus:plexus-utils</ignoredUnusedDeclaredDependency>
diff --git a/services-custom/dynamodb-enhanced/pom.xml b/services-custom/dynamodb-enhanced/pom.xml
index 25e64ad5f575..3f436db80a3c 100644
--- a/services-custom/dynamodb-enhanced/pom.xml
+++ b/services-custom/dynamodb-enhanced/pom.xml
@@ -67,9 +67,6 @@
                         <!--Ignore used undeclared test dependencies -->
                         <ignoredUsedUndeclaredDependency>software.amazon.awssdk:dynamodb-enhanced</ignoredUsedUndeclaredDependency>
                         <ignoredUsedUndeclaredDependency>org.hamcrest:*</ignoredUsedUndeclaredDependency>
-                        <ignoredUsedUndeclaredDependency>org.junit.jupiter:*</ignoredUsedUndeclaredDependency>
-                        <ignoredUsedUndeclaredDependency>org.junit.vintage:*</ignoredUsedUndeclaredDependency>
-                        <ignoredUsedUndeclaredDependency>junit:junit::*</ignoredUsedUndeclaredDependency>
                     </ignoredUsedUndeclaredDependencies>
                 </configuration>
             </plugin>
@@ -148,13 +145,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</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 ecc1de1b4c97..024856096c40 100644
--- a/services-custom/s3-transfer-manager/pom.xml
+++ b/services-custom/s3-transfer-manager/pom.xml
@@ -119,13 +119,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <artifactId>junit</artifactId>
+            <groupId>junit</groupId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index 598ce7bbe9f2..e1295efff355 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -75,13 +75,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/test/codegen-generated-classes-test/pom.xml b/test/codegen-generated-classes-test/pom.xml
index e31f8c4deb15..3feb6b1572de 100644
--- a/test/codegen-generated-classes-test/pom.xml
+++ b/test/codegen-generated-classes-test/pom.xml
@@ -118,13 +118,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/test/http-client-tests/pom.xml b/test/http-client-tests/pom.xml
index 14c2f0e904d1..57e7ca1a193f 100644
--- a/test/http-client-tests/pom.xml
+++ b/test/http-client-tests/pom.xml
@@ -59,15 +59,10 @@
             <version>${awsjavasdk.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>junit</artifactId>
+            <groupId>junit</groupId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
diff --git a/test/protocol-tests-core/pom.xml b/test/protocol-tests-core/pom.xml
index eac1f3d0d5d1..628a831bde5e 100644
--- a/test/protocol-tests-core/pom.xml
+++ b/test/protocol-tests-core/pom.xml
@@ -101,15 +101,10 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
diff --git a/test/protocol-tests/pom.xml b/test/protocol-tests/pom.xml
index 9acdb419a2d9..de0e55bba20a 100644
--- a/test/protocol-tests/pom.xml
+++ b/test/protocol-tests/pom.xml
@@ -123,13 +123,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/test/region-testing/pom.xml b/test/region-testing/pom.xml
index 093751850726..72fbf45a35a0 100644
--- a/test/region-testing/pom.xml
+++ b/test/region-testing/pom.xml
@@ -62,13 +62,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/test/service-test-utils/pom.xml b/test/service-test-utils/pom.xml
index a5a10440c1bc..58840333855d 100644
--- a/test/service-test-utils/pom.xml
+++ b/test/service-test-utils/pom.xml
@@ -69,13 +69,8 @@
             <version>${awsjavasdk.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <artifactId>junit</artifactId>
+            <groupId>junit</groupId>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -94,8 +89,6 @@
                     <ignoredUnusedDeclaredDependencies>
                         <!-- nice to have this pulled in so that service tests have these in scope -->
                         <ignoredUnusedDeclaredDependency>software.amazon.awssdk:test-utils:*</ignoredUnusedDeclaredDependency>
-                        <ignoredUnusedDeclaredDependency>org.junit.jupiter:*</ignoredUnusedDeclaredDependency>
-                        <ignoredUnusedDeclaredDependency>org.junit.vintage:*</ignoredUnusedDeclaredDependency>
                     </ignoredUnusedDeclaredDependencies>
                 </configuration>
             </plugin>
diff --git a/test/stability-tests/pom.xml b/test/stability-tests/pom.xml
index 6e7854a7e999..b5abf274080b 100644
--- a/test/stability-tests/pom.xml
+++ b/test/stability-tests/pom.xml
@@ -97,6 +97,12 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>test-utils</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>junit</artifactId>
+                    <groupId>junit</groupId>
+                </exclusion>
+            </exclusions>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -153,6 +159,12 @@
             <version>${junit5.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit5.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
diff --git a/test/test-utils/pom.xml b/test/test-utils/pom.xml
index bdcd2abd59f9..37a19f49d548 100644
--- a/test/test-utils/pom.xml
+++ b/test/test-utils/pom.xml
@@ -63,13 +63,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <artifactId>junit</artifactId>
+            <groupId>junit</groupId>
             <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 2af9ed7d3e40..9668bc08b129 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -55,13 +55,8 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>