diff --git a/instrumentation/kafka-clients/pom.xml b/instrumentation/kafka-clients/pom.xml
index f948b78032..0bac1b5dd7 100644
--- a/instrumentation/kafka-clients/pom.xml
+++ b/instrumentation/kafka-clients/pom.xml
@@ -64,7 +64,7 @@
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
-      <artifactId>testcontainers</artifactId>
+      <artifactId>junit-jupiter</artifactId>
       <version>${testcontainers.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/instrumentation/kafka-clients/src/it/kafka1/pom.xml b/instrumentation/kafka-clients/src/it/kafka1/pom.xml
index 400070972c..cc5a3f8712 100644
--- a/instrumentation/kafka-clients/src/it/kafka1/pom.xml
+++ b/instrumentation/kafka-clients/src/it/kafka1/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2013-2023 The OpenZipkin Authors
+    Copyright 2013-2024 The OpenZipkin Authors
 
     Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
     in compliance with the License. You may obtain a copy of the License at
@@ -86,7 +86,7 @@
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
-      <artifactId>testcontainers</artifactId>
+      <artifactId>junit-jupiter</artifactId>
       <version>@testcontainers.version@</version>
     </dependency>
   </dependencies>
diff --git a/instrumentation/kafka-clients/src/test/java/brave/kafka/clients/ITKafkaTracing.java b/instrumentation/kafka-clients/src/test/java/brave/kafka/clients/ITKafkaTracing.java
index 9fc3a1b15b..c63fb2380f 100644
--- a/instrumentation/kafka-clients/src/test/java/brave/kafka/clients/ITKafkaTracing.java
+++ b/instrumentation/kafka-clients/src/test/java/brave/kafka/clients/ITKafkaTracing.java
@@ -37,9 +37,12 @@
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.common.TopicPartition;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
 import static brave.kafka.clients.KafkaTags.KAFKA_TOPIC_TAG;
 import static brave.kafka.clients.KafkaTest.TEST_KEY;
@@ -48,9 +51,11 @@
 import static brave.messaging.MessagingRequestMatchers.operationEquals;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Tag("docker")
+@Testcontainers(disabledWithoutDocker = true)
+@Timeout(60)
 public class ITKafkaTracing extends ITKafka { // public for src/it
-  @RegisterExtension KafkaExtension kafka = new KafkaExtension();
+  @Container KafkaContainer kafka = new KafkaContainer();
   @RegisterExtension IntegrationTestSpanHandler producerSpanHandler =
     new IntegrationTestSpanHandler();
   @RegisterExtension IntegrationTestSpanHandler consumerSpanHandler =
diff --git a/instrumentation/kafka-clients/src/test/java/brave/kafka/clients/KafkaExtension.java b/instrumentation/kafka-clients/src/test/java/brave/kafka/clients/KafkaContainer.java
similarity index 59%
rename from instrumentation/kafka-clients/src/test/java/brave/kafka/clients/KafkaExtension.java
rename to instrumentation/kafka-clients/src/test/java/brave/kafka/clients/KafkaContainer.java
index 71720cec2b..b02bd7daaa 100644
--- a/instrumentation/kafka-clients/src/test/java/brave/kafka/clients/KafkaExtension.java
+++ b/instrumentation/kafka-clients/src/test/java/brave/kafka/clients/KafkaContainer.java
@@ -18,10 +18,6 @@
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.apache.kafka.common.serialization.StringSerializer;
-import org.junit.jupiter.api.extension.AfterAllCallback;
-import org.junit.jupiter.api.extension.BeforeAllCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.opentest4j.TestAbortedException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
@@ -31,32 +27,20 @@
 
 import static org.testcontainers.utility.DockerImageName.parse;
 
-class KafkaExtension implements BeforeAllCallback, AfterAllCallback {
-  static final Logger LOGGER = LoggerFactory.getLogger(KafkaExtension.class);
+final class KafkaContainer extends GenericContainer<KafkaContainer> {
+  static final Logger LOGGER = LoggerFactory.getLogger(KafkaContainer.class);
   static final int KAFKA_PORT = 19092;
 
-  final KafkaContainer container = new KafkaContainer();
-
-  @Override public void beforeAll(ExtensionContext context) {
-    if (context.getRequiredTestClass().getEnclosingClass() != null) {
-      // Only run once in outermost scope.
-      return;
-    }
-
-    container.start();
-    LOGGER.info("Using bootstrapServer " + bootstrapServer());
+  KafkaContainer() {
+    super(parse("ghcr.io/openzipkin/zipkin-kafka:3.0.2"));
+    waitStrategy = Wait.forHealthcheck();
+    // Kafka broker listener port (19092) needs to be exposed for test cases to access it.
+    addFixedExposedPort(KAFKA_PORT, KAFKA_PORT, InternetProtocol.TCP);
+    withLogConsumer(new Slf4jLogConsumer(LOGGER));
   }
 
   String bootstrapServer() {
-    return container.getHost() + ":" + container.getMappedPort(KAFKA_PORT);
-  }
-
-  @Override public void afterAll(ExtensionContext context) {
-    if (context.getRequiredTestClass().getEnclosingClass() != null) {
-      // Only run once in outermost scope.
-      return;
-    }
-    container.stop();
+    return getHost() + ":" + getMappedPort(KAFKA_PORT);
   }
 
   KafkaProducer<String, String> createStringProducer() {
@@ -91,18 +75,4 @@ Properties consumerConfig() {
     props.put("metadata.max.age.ms", "100");
     return props;
   }
-
-  // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537
-  static final class KafkaContainer extends GenericContainer<KafkaContainer> {
-    KafkaContainer() {
-      super(parse("ghcr.io/openzipkin/zipkin-kafka:2.27.0"));
-      if ("true".equals(System.getProperty("docker.skip"))) {
-        throw new TestAbortedException("${docker.skip} == true");
-      }
-      waitStrategy = Wait.forHealthcheck();
-      // Kafka broker listener port (19092) needs to be exposed for test cases to access it.
-      addFixedExposedPort(KAFKA_PORT, KAFKA_PORT, InternetProtocol.TCP);
-      withLogConsumer(new Slf4jLogConsumer(LOGGER));
-    }
-  }
 }
diff --git a/instrumentation/kafka-streams/pom.xml b/instrumentation/kafka-streams/pom.xml
index 137120868c..83eb7eb52a 100644
--- a/instrumentation/kafka-streams/pom.xml
+++ b/instrumentation/kafka-streams/pom.xml
@@ -64,7 +64,7 @@
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
-      <artifactId>testcontainers</artifactId>
+      <artifactId>junit-jupiter</artifactId>
       <version>${testcontainers.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/ITKafkaStreamsTracing.java b/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/ITKafkaStreamsTracing.java
index 9bf6cdff6b..98ef2242f4 100644
--- a/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/ITKafkaStreamsTracing.java
+++ b/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/ITKafkaStreamsTracing.java
@@ -34,9 +34,13 @@
 import org.apache.kafka.streams.kstream.Consumed;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
 import static brave.Span.Kind.CONSUMER;
 import static brave.Span.Kind.PRODUCER;
@@ -44,9 +48,11 @@
 import static brave.kafka.streams.KafkaStreamsTracingTest.TEST_VALUE;
 import static org.assertj.core.api.Assertions.assertThat;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Tag("docker")
+@Testcontainers(disabledWithoutDocker = true)
+@Timeout(60)
 class ITKafkaStreamsTracing extends ITKafkaStreams {
-  @RegisterExtension KafkaExtension kafka = new KafkaExtension();
+  @Container KafkaContainer kafka = new KafkaContainer();
 
   Producer<String, String> producer;
 
diff --git a/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/KafkaExtension.java b/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/KafkaContainer.java
similarity index 59%
rename from instrumentation/kafka-streams/src/test/java/brave/kafka/streams/KafkaExtension.java
rename to instrumentation/kafka-streams/src/test/java/brave/kafka/streams/KafkaContainer.java
index 086359581d..18a3316338 100644
--- a/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/KafkaExtension.java
+++ b/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/KafkaContainer.java
@@ -18,10 +18,6 @@
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.common.serialization.StringDeserializer;
 import org.apache.kafka.common.serialization.StringSerializer;
-import org.junit.jupiter.api.extension.AfterAllCallback;
-import org.junit.jupiter.api.extension.BeforeAllCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
-import org.opentest4j.TestAbortedException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
@@ -31,32 +27,20 @@
 
 import static org.testcontainers.utility.DockerImageName.parse;
 
-class KafkaExtension implements BeforeAllCallback, AfterAllCallback {
-  static final Logger LOGGER = LoggerFactory.getLogger(KafkaExtension.class);
+final class KafkaContainer extends GenericContainer<KafkaContainer> {
+  static final Logger LOGGER = LoggerFactory.getLogger(KafkaContainer.class);
   static final int KAFKA_PORT = 19092;
 
-  final KafkaContainer container = new KafkaContainer();
-
-  @Override public void beforeAll(ExtensionContext context) {
-    if (context.getRequiredTestClass().getEnclosingClass() != null) {
-      // Only run once in outermost scope.
-      return;
-    }
-
-    container.start();
-    LOGGER.info("Using bootstrapServer " + bootstrapServer());
+  KafkaContainer() {
+    super(parse("ghcr.io/openzipkin/zipkin-kafka:3.0.2"));
+    waitStrategy = Wait.forHealthcheck();
+    // Kafka broker listener port (19092) needs to be exposed for test cases to access it.
+    addFixedExposedPort(KAFKA_PORT, KAFKA_PORT, InternetProtocol.TCP);
+    withLogConsumer(new Slf4jLogConsumer(LOGGER));
   }
 
   String bootstrapServer() {
-    return container.getHost() + ":" + container.getMappedPort(KAFKA_PORT);
-  }
-
-  @Override public void afterAll(ExtensionContext context) {
-    if (context.getRequiredTestClass().getEnclosingClass() != null) {
-      // Only run once in outermost scope.
-      return;
-    }
-    container.stop();
+    return getHost() + ":" + getMappedPort(KAFKA_PORT);
   }
 
   KafkaProducer<String, String> createStringProducer() {
@@ -91,18 +75,4 @@ Properties consumerConfig() {
     props.put("metadata.max.age.ms", "100");
     return props;
   }
-
-  // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537
-  static final class KafkaContainer extends GenericContainer<KafkaContainer> {
-    KafkaContainer() {
-      super(parse("ghcr.io/openzipkin/zipkin-kafka:2.27.0"));
-      if ("true".equals(System.getProperty("docker.skip"))) {
-        throw new TestAbortedException("${docker.skip} == true");
-      }
-      waitStrategy = Wait.forHealthcheck();
-      // Kafka broker listener port (19092) needs to be exposed for test cases to access it.
-      addFixedExposedPort(KAFKA_PORT, KAFKA_PORT, InternetProtocol.TCP);
-      withLogConsumer(new Slf4jLogConsumer(LOGGER));
-    }
-  }
 }
diff --git a/instrumentation/mongodb/pom.xml b/instrumentation/mongodb/pom.xml
index 88fe91f085..9342f6c7ee 100644
--- a/instrumentation/mongodb/pom.xml
+++ b/instrumentation/mongodb/pom.xml
@@ -49,7 +49,7 @@
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
-      <artifactId>testcontainers</artifactId>
+      <artifactId>junit-jupiter</artifactId>
       <version>${testcontainers.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/instrumentation/mongodb/src/test/java/brave/mongodb/ITMongoDBTracing.java b/instrumentation/mongodb/src/test/java/brave/mongodb/ITMongoDBTracing.java
index bc709c7d1b..08759fc99a 100644
--- a/instrumentation/mongodb/src/test/java/brave/mongodb/ITMongoDBTracing.java
+++ b/instrumentation/mongodb/src/test/java/brave/mongodb/ITMongoDBTracing.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -32,12 +32,13 @@
 import org.bson.BsonDocument;
 import org.bson.BsonString;
 import org.bson.Document;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Timeout;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
 import static brave.Span.Kind.CLIENT;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -45,25 +46,28 @@
 import static org.assertj.core.api.Assertions.entry;
 import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
 
-@TestInstance(TestInstance.Lifecycle.PER_CLASS) class ITMongoDBTracing extends ITRemote {
+@Tag("docker")
+@Testcontainers(disabledWithoutDocker = true)
+@Timeout(60)
+class ITMongoDBTracing extends ITRemote {
   static final String DATABASE_NAME = "myDatabase";
   static final String COLLECTION_NAME = "myCollection";
   static final String INVALID_COLLECTION_NAME = "?.$";
 
-  @RegisterExtension MongoDBExtension mongo = new MongoDBExtension();
+  @Container MongoDBContainer mongo = new MongoDBContainer();
   CommandListener listener = MongoDBTracing.newBuilder(tracing).build().commandListener();
   MongoClientSettings settings;
   MongoClient mongoClient;
   MongoDatabase database;
   String clusterId;
 
-  @BeforeAll void initClient() {
+  @BeforeEach void initClient() {
     settings = mongo.mongoClientSettingsBuilder().addCommandListener(listener).build();
     mongoClient = MongoClients.create(settings);
     database = mongoClient.getDatabase(DATABASE_NAME);
   }
 
-  @AfterAll void closeClient() {
+  @AfterEach void closeClient() {
     mongoClient.close();
   }
 
diff --git a/instrumentation/mongodb/src/test/java/brave/mongodb/MongoDBExtension.java b/instrumentation/mongodb/src/test/java/brave/mongodb/MongoDBContainer.java
similarity index 55%
rename from instrumentation/mongodb/src/test/java/brave/mongodb/MongoDBExtension.java
rename to instrumentation/mongodb/src/test/java/brave/mongodb/MongoDBContainer.java
index ed77ec245e..d5c4556f38 100644
--- a/instrumentation/mongodb/src/test/java/brave/mongodb/MongoDBExtension.java
+++ b/instrumentation/mongodb/src/test/java/brave/mongodb/MongoDBContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -22,13 +22,11 @@
 import java.time.Duration;
 import java.util.Arrays;
 import org.bson.Document;
-import org.junit.jupiter.api.extension.AfterAllCallback;
-import org.junit.jupiter.api.extension.BeforeAllCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
 import org.opentest4j.TestAbortedException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.wait.strategy.Wait;
 
 import static brave.mongodb.ITMongoDBTracing.COLLECTION_NAME;
@@ -36,25 +34,24 @@
 import static java.util.Collections.singletonList;
 import static org.testcontainers.utility.DockerImageName.parse;
 
-class MongoDBExtension implements BeforeAllCallback, AfterAllCallback {
-  static final Logger LOGGER = LoggerFactory.getLogger(MongoDBExtension.class);
+final class MongoDBContainer extends GenericContainer<MongoDBContainer> {
+  static final Logger LOGGER = LoggerFactory.getLogger(MongoDBContainer.class);
   static final int MONGODB_PORT = 27017;
 
-  MongoDBContainer container = new MongoDBContainer();
-
-  MongoClientSettings.Builder mongoClientSettingsBuilder() {
-    return MongoClientSettings.builder().applyToClusterSettings(b -> b.hosts(singletonList(
-      new ServerAddress(host(), port()))));
-  }
-
-  @Override public void beforeAll(ExtensionContext context) {
-    if (context.getRequiredTestClass().getEnclosingClass() != null) {
-      // Only run once in outermost scope.
-      return;
+  MongoDBContainer() {
+    // Use OpenZipkin's small test image, which is multi-arch and doesn't consume Docker Hub quota
+    super(parse("ghcr.io/openzipkin/mongodb-alpine:4.0.5"));
+    if ("true".equals(System.getProperty("docker.skip"))) {
+      throw new TestAbortedException("${docker.skip} == true");
     }
+    withExposedPorts(MONGODB_PORT);
+    waitStrategy = Wait.forLogMessage(".*waiting for connections.*", 1);
+    withStartupTimeout(Duration.ofSeconds(60));
+    withLogConsumer(new Slf4jLogConsumer(LOGGER));
+  }
 
-    container.start();
-    LOGGER.info("Using hostPort " + host() + ":" + port());
+  @Override public void start() {
+    super.start();
     try (MongoClient mongoClient = MongoClients.create(mongoClientSettingsBuilder().build())) {
       MongoDatabase database = mongoClient.getDatabase(DATABASE_NAME);
       MongoCollection<Document> collection = database.getCollection(COLLECTION_NAME);
@@ -64,34 +61,16 @@ MongoClientSettings.Builder mongoClientSettingsBuilder() {
     }
   }
 
-  @Override public void afterAll(ExtensionContext context) {
-    if (context.getRequiredTestClass().getEnclosingClass() != null) {
-      // Only run once in outermost scope.
-      return;
-    }
-
-    container.stop();
+  MongoClientSettings.Builder mongoClientSettingsBuilder() {
+    return MongoClientSettings.builder().applyToClusterSettings(b -> b.hosts(singletonList(
+      new ServerAddress(host(), port()))));
   }
 
   String host() {
-    return container.getHost();
+    return getHost();
   }
 
   int port() {
-    return container.getMappedPort(MONGODB_PORT);
-  }
-
-  // mostly waiting for https://github.com/testcontainers/testcontainers-java/issues/3537
-  static final class MongoDBContainer extends GenericContainer<MongoDBContainer> {
-    MongoDBContainer() {
-      // Use OpenZipkin's small test image, which is multi-arch and doesn't consume Docker Hub quota
-      super(parse("ghcr.io/openzipkin/mongodb-alpine:4.0.5"));
-      if ("true".equals(System.getProperty("docker.skip"))) {
-        throw new TestAbortedException("${docker.skip} == true");
-      }
-      withExposedPorts(MONGODB_PORT);
-      waitStrategy = Wait.forLogMessage(".*waiting for connections.*", 1);
-      withStartupTimeout(Duration.ofSeconds(60));
-    }
+    return getMappedPort(MONGODB_PORT);
   }
 }
diff --git a/instrumentation/spring-rabbit/pom.xml b/instrumentation/spring-rabbit/pom.xml
index 156b83e3e1..64b4c9f948 100644
--- a/instrumentation/spring-rabbit/pom.xml
+++ b/instrumentation/spring-rabbit/pom.xml
@@ -75,7 +75,7 @@
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
-      <artifactId>testcontainers</artifactId>
+      <artifactId>junit-jupiter</artifactId>
       <version>${testcontainers.version}</version>
       <scope>test</scope>
     </dependency>
diff --git a/instrumentation/spring-rabbit/src/test/java/brave/spring/rabbit/ITSpringRabbit.java b/instrumentation/spring-rabbit/src/test/java/brave/spring/rabbit/ITSpringRabbit.java
index d2c4b6a3d9..49e294d094 100644
--- a/instrumentation/spring-rabbit/src/test/java/brave/spring/rabbit/ITSpringRabbit.java
+++ b/instrumentation/spring-rabbit/src/test/java/brave/spring/rabbit/ITSpringRabbit.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 The OpenZipkin Authors
+ * Copyright 2013-2024 The OpenZipkin Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
@@ -24,12 +24,11 @@
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import org.junit.AssumptionViolatedException;
 import org.junit.Rule;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Timeout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.core.Binding;
@@ -51,12 +50,18 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.messaging.handler.annotation.SendTo;
 import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.utility.DockerImageName;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
 
 import static org.springframework.amqp.core.BindingBuilder.bind;
 import static org.springframework.amqp.core.ExchangeBuilder.topicExchange;
+import static org.testcontainers.utility.DockerImageName.parse;
 
+@Tag("docker")
+@Testcontainers(disabledWithoutDocker = true)
+@Timeout(60)
 abstract class ITSpringRabbit extends ITRemote {
   static final Logger LOGGER = LoggerFactory.getLogger(ITSpringRabbit.class);
 
@@ -85,64 +90,46 @@ abstract class ITSpringRabbit extends ITRemote {
   static final Binding binding_reply =
     bind(queue_reply).to(exchange_request_reply).with("test.binding.reply").noargs();
 
-  // Use a ghcr.io mirror to prevent build outages due to Docker Hub pull quotas
-  static final DockerImageName IMAGE =
-    DockerImageName.parse("ghcr.io/openzipkin/rabbitmq-management-alpine:latest");
   static final int RABBIT_PORT = 5672;
 
-  static final class RabbitMQContainer extends GenericContainer<RabbitMQContainer> {
-    RabbitMQContainer(DockerImageName image) {
-      super(image);
-      addExposedPorts(RABBIT_PORT);
-      this.waitStrategy = Wait.forLogMessage(".*Server startup complete.*", 1)
-        .withStartupTimeout(Duration.ofSeconds(60));
-    }
-  }
+  @Container RabbitMQContainer rabbit = new RabbitMQContainer();
 
-  static RabbitMQContainer rabbit;
-
-  @BeforeAll public static void startRabbit() {
-    if ("true".equals(System.getProperty("docker.skip"))) {
-      throw new AssumptionViolatedException("Skipping startup of docker " + IMAGE);
-    }
 
-    try {
-      LOGGER.info("Starting docker image " + IMAGE);
-      rabbit = new RabbitMQContainer(IMAGE);
-      rabbit.start();
-    } catch (Throwable e) {
-      throw new AssumptionViolatedException(
-        "Couldn't start docker image " + IMAGE + ": " + e.getMessage(), e);
+  static final class RabbitMQContainer extends GenericContainer<RabbitMQContainer> {
+    RabbitMQContainer() {
+      super(parse("ghcr.io/openzipkin/zipkin-rabbitmq:3.0.2"));
+      withExposedPorts(RABBIT_PORT);
+      waitStrategy = Wait.forLogMessage(".*Server startup complete.*", 1);
+      withStartupTimeout(Duration.ofSeconds(60));
+      withLogConsumer(new Slf4jLogConsumer(LOGGER));
     }
 
-    CachingConnectionFactory connectionFactory = new CachingConnectionFactory(
-      rabbit.getContainerIpAddress(),
-      rabbit.getMappedPort(RABBIT_PORT)
-    );
-    try {
-      RabbitAdmin amqpAdmin = new RabbitAdmin(connectionFactory);
-      amqpAdmin.declareExchange(exchange);
-      amqpAdmin.declareQueue(queue);
-      amqpAdmin.declareBinding(binding);
-
-      amqpAdmin.declareExchange(exchange_batch);
-      amqpAdmin.declareQueue(queue_batch);
-      amqpAdmin.declareBinding(binding_batch);
-
-      amqpAdmin.declareExchange(exchange_request_reply);
-      amqpAdmin.declareQueue(queue_request);
-      amqpAdmin.declareQueue(queue_reply);
-      amqpAdmin.declareBinding(binding_request);
-      amqpAdmin.declareBinding(binding_reply);
-    } finally {
-      connectionFactory.destroy();
+    @Override public void start() {
+      super.start();
+
+      CachingConnectionFactory connectionFactory =
+        new CachingConnectionFactory(getHost(), getMappedPort(RABBIT_PORT));
+      try {
+        RabbitAdmin amqpAdmin = new RabbitAdmin(connectionFactory);
+        amqpAdmin.declareExchange(exchange);
+        amqpAdmin.declareQueue(queue);
+        amqpAdmin.declareBinding(binding);
+
+        amqpAdmin.declareExchange(exchange_batch);
+        amqpAdmin.declareQueue(queue_batch);
+        amqpAdmin.declareBinding(binding_batch);
+
+        amqpAdmin.declareExchange(exchange_request_reply);
+        amqpAdmin.declareQueue(queue_request);
+        amqpAdmin.declareQueue(queue_reply);
+        amqpAdmin.declareBinding(binding_request);
+        amqpAdmin.declareBinding(binding_reply);
+      } finally {
+        connectionFactory.destroy();
+      }
     }
   }
 
-  @AfterAll public static void kiwwTheWabbit() {
-    if (rabbit != null) rabbit.stop();
-  }
-
   @Rule public IntegrationTestSpanHandler producerSpanHandler = new IntegrationTestSpanHandler();
   @Rule public IntegrationTestSpanHandler consumerSpanHandler = new IntegrationTestSpanHandler();
 
@@ -151,24 +138,25 @@ static final class RabbitMQContainer extends GenericContainer<RabbitMQContainer>
 
   SpringRabbitTracing producerTracing = SpringRabbitTracing.create(
     MessagingTracing.newBuilder(tracingBuilder(Sampler.ALWAYS_SAMPLE).localServiceName("producer")
-      .clearSpanHandlers().addSpanHandler(producerSpanHandler).build())
+        .clearSpanHandlers().addSpanHandler(producerSpanHandler).build())
       .producerSampler(r -> producerSampler.trySample(r))
       .build()
   );
 
   SpringRabbitTracing consumerTracing = SpringRabbitTracing.create(
     MessagingTracing.newBuilder(tracingBuilder(Sampler.ALWAYS_SAMPLE).localServiceName("consumer")
-      .clearSpanHandlers().addSpanHandler(consumerSpanHandler).build())
+        .clearSpanHandlers().addSpanHandler(consumerSpanHandler).build())
       .consumerSampler(r -> consumerSampler.trySample(r))
       .build()
   );
 
-  CachingConnectionFactory connectionFactory =
-    new CachingConnectionFactory(rabbit.getContainerIpAddress(), rabbit.getMappedPort(RABBIT_PORT));
+  CachingConnectionFactory connectionFactory;
   AnnotationConfigApplicationContext producerContext = new AnnotationConfigApplicationContext();
   AnnotationConfigApplicationContext consumerContext = new AnnotationConfigApplicationContext();
 
   @BeforeEach void refresh() {
+    connectionFactory =
+      new CachingConnectionFactory(rabbit.getHost(), rabbit.getMappedPort(RABBIT_PORT));
     producerContext.registerBean(SpringRabbitTracing.class, () -> producerTracing);
     producerContext.registerBean(CachingConnectionFactory.class, () -> connectionFactory);
     producerContext.registerBean(Binding.class, () -> binding);
diff --git a/pom.xml b/pom.xml
index bbc11e0d4e..b5d6dd0b0c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
     <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
     <maven-shade-plugin.version>3.5.1</maven-shade-plugin.version>
     <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
-    <maven-surefire-plugin.version>3.2.3</maven-surefire-plugin.version>
+    <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
     <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
   </properties>