diff --git a/pom.xml b/pom.xml
index 7bb51424..960ed56d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,21 +153,7 @@
           <compilerArgs>
             <arg>-Xlint</arg>
             <arg>-XDcompilePolicy=simple</arg>
-            <arg>-Xplugin:ErrorProne
-                 -Xep:CanIgnoreReturnValueSuggester:OFF
-                 -Xep:DefaultCharset:OFF
-                 -Xep:HidingField:OFF
-                 -Xep:JavaUtilDate:OFF
-                 -Xep:ProtectedMembersInFinalClass:OFF
-            </arg>
           </compilerArgs>
-          <annotationProcessorPaths>
-            <path>
-              <groupId>com.google.errorprone</groupId>
-              <artifactId>error_prone_core</artifactId>
-              <version>2.16</version>
-            </path>
-          </annotationProcessorPaths>
         </configuration>
       </plugin>
       <plugin>
@@ -294,7 +280,7 @@
           </dependency>
         </dependencies>
         <configuration>
-          <parallel>all</parallel>
+          <parallel>classes</parallel>
           <threadCount>1</threadCount>
           <argLine>-Xmx512m</argLine>
           <redirectTestOutputToFile>true</redirectTestOutputToFile>
@@ -375,10 +361,10 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <java.version>11</java.version>
-    <jclouds.version>2.5.0</jclouds.version>
+    <jclouds.version>2.6.0-SNAPSHOT</jclouds.version>
     <slf4j.version>2.0.6</slf4j.version>
     <shade.prefix>${project.groupId}.shaded</shade.prefix>
-    <surefire.version>2.22.2</surefire.version>
+    <surefire.version>3.0.0-M8</surefire.version>
   </properties>
 
   <repositories>
@@ -479,7 +465,7 @@
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
       <!-- we need to use the same version as in jclouds because we pull in their tests -->
-      <version>1.7.1</version>
+      <version>3.23.1</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -522,7 +508,7 @@
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>6.8.21</version>
+      <version>7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/src/test/java/org/gaul/s3proxy/EncryptedBlobStoreLiveTest.java b/src/test/java/org/gaul/s3proxy/EncryptedBlobStoreLiveTest.java
index da328a9d..724e6c9f 100644
--- a/src/test/java/org/gaul/s3proxy/EncryptedBlobStoreLiveTest.java
+++ b/src/test/java/org/gaul/s3proxy/EncryptedBlobStoreLiveTest.java
@@ -48,7 +48,7 @@
 import org.jclouds.s3.domain.S3Object;
 import org.jclouds.s3.reference.S3Constants;
 import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterSuite;
 import org.testng.annotations.Test;
 
 @SuppressWarnings("UnstableApiUsage")
@@ -64,10 +64,11 @@ public final class EncryptedBlobStoreLiveTest extends S3ClientLiveTest {
     private S3Proxy s3Proxy;
     private BlobStoreContext context;
 
-    @AfterClass
-    public void tearDown() throws Exception {
-        s3Proxy.stop();
+    @AfterSuite
+    @Override
+    public void destroyResources() throws Exception {
         context.close();
+        s3Proxy.stop();
     }
 
     @Override
diff --git a/src/test/java/org/gaul/s3proxy/JcloudsBucketsLiveTest.java b/src/test/java/org/gaul/s3proxy/JcloudsBucketsLiveTest.java
index fa22c0a7..376f79c0 100644
--- a/src/test/java/org/gaul/s3proxy/JcloudsBucketsLiveTest.java
+++ b/src/test/java/org/gaul/s3proxy/JcloudsBucketsLiveTest.java
@@ -32,7 +32,7 @@
 import org.jclouds.s3.reference.S3Constants;
 import org.jclouds.s3.services.BucketsLiveTest;
 import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterSuite;
 import org.testng.annotations.Test;
 
 @Test(testName = "JcloudsBucketsLiveTest")
@@ -46,10 +46,11 @@ public final class JcloudsBucketsLiveTest extends BucketsLiveTest {
     private BlobStoreContext context;
     private String blobStoreType;
 
-    @AfterClass
-    public void tearDown() throws Exception {
-        s3Proxy.stop();
+    @AfterSuite
+    @Override
+    public void destroyResources() throws Exception {
         context.close();
+        s3Proxy.stop();
     }
 
     @Override
diff --git a/src/test/java/org/gaul/s3proxy/JcloudsS3BlobIntegrationLiveTest.java b/src/test/java/org/gaul/s3proxy/JcloudsS3BlobIntegrationLiveTest.java
index d349cb5f..bc66827b 100644
--- a/src/test/java/org/gaul/s3proxy/JcloudsS3BlobIntegrationLiveTest.java
+++ b/src/test/java/org/gaul/s3proxy/JcloudsS3BlobIntegrationLiveTest.java
@@ -27,7 +27,7 @@
 import org.jclouds.s3.blobstore.integration.S3BlobIntegrationLiveTest;
 import org.jclouds.s3.reference.S3Constants;
 import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterSuite;
 import org.testng.annotations.Test;
 
 @Test(testName = "JcloudsS3BlobIntegrationLiveTest")
@@ -42,10 +42,11 @@ public final class JcloudsS3BlobIntegrationLiveTest
     private BlobStoreContext context;
     private String blobStoreType;
 
-    @AfterClass
-    public void tearDown() throws Exception {
-        s3Proxy.stop();
+    @AfterSuite
+    @Override
+    public void destroyResources() throws Exception {
         context.close();
+        s3Proxy.stop();
     }
 
     @Override
diff --git a/src/test/java/org/gaul/s3proxy/JcloudsS3BlobSignerLiveTest.java b/src/test/java/org/gaul/s3proxy/JcloudsS3BlobSignerLiveTest.java
index 23e49e58..6f333b38 100644
--- a/src/test/java/org/gaul/s3proxy/JcloudsS3BlobSignerLiveTest.java
+++ b/src/test/java/org/gaul/s3proxy/JcloudsS3BlobSignerLiveTest.java
@@ -25,7 +25,7 @@
 import org.jclouds.blobstore.BlobStoreContext;
 import org.jclouds.s3.blobstore.integration.S3BlobSignerLiveTest;
 import org.jclouds.s3.reference.S3Constants;
-import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterSuite;
 import org.testng.annotations.Test;
 
 @Test(testName = "JcloudsS3BlobSignerLiveTest")
@@ -38,10 +38,11 @@ public final class JcloudsS3BlobSignerLiveTest extends S3BlobSignerLiveTest {
     private S3Proxy s3Proxy;
     private BlobStoreContext context;
 
-    @AfterClass
-    public void tearDown() throws Exception {
-        s3Proxy.stop();
+    @AfterSuite
+    @Override
+    public void destroyResources() throws Exception {
         context.close();
+        s3Proxy.stop();
     }
 
     @Override
diff --git a/src/test/java/org/gaul/s3proxy/JcloudsS3ClientLiveTest.java b/src/test/java/org/gaul/s3proxy/JcloudsS3ClientLiveTest.java
index 3602f1cb..53bf919d 100644
--- a/src/test/java/org/gaul/s3proxy/JcloudsS3ClientLiveTest.java
+++ b/src/test/java/org/gaul/s3proxy/JcloudsS3ClientLiveTest.java
@@ -36,7 +36,7 @@
 import org.jclouds.s3.domain.S3Object;
 import org.jclouds.s3.reference.S3Constants;
 import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterSuite;
 import org.testng.annotations.Test;
 
 @Test(testName = "JcloudsS3ClientLiveTest")
@@ -50,10 +50,11 @@ public final class JcloudsS3ClientLiveTest extends S3ClientLiveTest {
     private BlobStoreContext context;
     private String blobStoreType;
 
-    @AfterClass
-    public void tearDown() throws Exception {
-        s3Proxy.stop();
+    @AfterSuite
+    @Override
+    public void destroyResources() throws Exception {
         context.close();
+        s3Proxy.stop();
     }
 
     @Override
diff --git a/src/test/java/org/gaul/s3proxy/JcloudsS3ContainerIntegrationLiveTest.java b/src/test/java/org/gaul/s3proxy/JcloudsS3ContainerIntegrationLiveTest.java
index 6d060b23..a19168ce 100644
--- a/src/test/java/org/gaul/s3proxy/JcloudsS3ContainerIntegrationLiveTest.java
+++ b/src/test/java/org/gaul/s3proxy/JcloudsS3ContainerIntegrationLiveTest.java
@@ -26,7 +26,7 @@
 import org.jclouds.s3.blobstore.integration.S3ContainerIntegrationLiveTest;
 import org.jclouds.s3.reference.S3Constants;
 import org.testng.SkipException;
-import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterSuite;
 import org.testng.annotations.Test;
 
 @Test(testName = "JcloudsS3ContainerIntegrationLiveTest")
@@ -41,10 +41,11 @@ public final class JcloudsS3ContainerIntegrationLiveTest
     private BlobStoreContext context;
     private String blobStoreType;
 
-    @AfterClass
-    public void tearDown() throws Exception {
-        s3Proxy.stop();
+    @AfterSuite
+    @Override
+    public void destroyResources() throws Exception {
         context.close();
+        s3Proxy.stop();
     }
 
     @Override