diff --git a/instrumentation/mongo/mongo-4.0/javaagent/src/test/groovy/Mongo4ReactiveClientTest.groovy b/instrumentation/mongo/mongo-4.0/javaagent/src/test/groovy/Mongo4ReactiveClientTest.groovy
index 8d4f9a4e9e..6b62b75412 100644
--- a/instrumentation/mongo/mongo-4.0/javaagent/src/test/groovy/Mongo4ReactiveClientTest.groovy
+++ b/instrumentation/mongo/mongo-4.0/javaagent/src/test/groovy/Mongo4ReactiveClientTest.groovy
@@ -23,11 +23,14 @@ import spock.lang.Shared
 
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
 
 class Mongo4ReactiveClientTest extends AbstractMongoClientTest<MongoCollection<Document>> implements AgentTestTrait {
 
   @Shared
   MongoClient client
+  @Shared
+  List<Closeable> cleanup = []
 
   def setupSpec() throws Exception {
     client = MongoClients.create("mongodb://localhost:$port")
@@ -36,18 +39,27 @@ class Mongo4ReactiveClientTest extends AbstractMongoClientTest<MongoCollection<D
   def cleanupSpec() throws Exception {
     client?.close()
     client = null
+    cleanup.forEach {
+      it.close()
+    }
   }
 
   @Override
   void createCollection(String dbName, String collectionName) {
     MongoDatabase db = client.getDatabase(dbName)
-    db.createCollection(collectionName).subscribe(toSubscriber {})
+    def latch = new CountDownLatch(1)
+    db.createCollection(collectionName).subscribe(toSubscriber { latch.countDown() })
+    latch.await(30, TimeUnit.SECONDS)
   }
 
   @Override
   void createCollectionNoDescription(String dbName, String collectionName) {
-    MongoDatabase db = MongoClients.create("mongodb://localhost:${port}").getDatabase(dbName)
-    db.createCollection(collectionName).subscribe(toSubscriber {})
+    def tmpClient = MongoClients.create("mongodb://localhost:${port}")
+    cleanup.add(tmpClient)
+    MongoDatabase db = tmpClient.getDatabase(dbName)
+    def latch = new CountDownLatch(1)
+    db.createCollection(collectionName).subscribe(toSubscriber { latch.countDown() })
+    latch.await(30, TimeUnit.SECONDS)
   }
 
   @Override
@@ -63,8 +75,12 @@ class Mongo4ReactiveClientTest extends AbstractMongoClientTest<MongoCollection<D
           new ServerAddress("localhost", port)))
       })
     settings.build()
-    MongoDatabase db = MongoClients.create(settings.build()).getDatabase(dbName)
-    db.createCollection(collectionName).subscribe(toSubscriber {})
+    def tmpClient = MongoClients.create(settings.build())
+    cleanup.add(tmpClient)
+    MongoDatabase db = tmpClient.getDatabase(dbName)
+    def latch = new CountDownLatch(1)
+    db.createCollection(collectionName).subscribe(toSubscriber { latch.countDown() })
+    latch.await(30, TimeUnit.SECONDS)
   }
 
   @Override
@@ -72,7 +88,7 @@ class Mongo4ReactiveClientTest extends AbstractMongoClientTest<MongoCollection<D
     MongoDatabase db = client.getDatabase(dbName)
     def count = new CompletableFuture<Integer>()
     db.getCollection(collectionName).estimatedDocumentCount().subscribe(toSubscriber { count.complete(it) })
-    return count.join()
+    return count.get(30, TimeUnit.SECONDS)
   }
 
   @Override
@@ -81,7 +97,7 @@ class Mongo4ReactiveClientTest extends AbstractMongoClientTest<MongoCollection<D
       MongoDatabase db = client.getDatabase(dbName)
       def latch1 = new CountDownLatch(1)
       db.createCollection(collectionName).subscribe(toSubscriber { latch1.countDown() })
-      latch1.await()
+      latch1.await(30, TimeUnit.SECONDS)
       return db.getCollection(collectionName)
     }
     ignoreTracesAndClear(1)
@@ -94,7 +110,7 @@ class Mongo4ReactiveClientTest extends AbstractMongoClientTest<MongoCollection<D
     collection.insertOne(new Document("password", "SECRET")).subscribe(toSubscriber {
       collection.estimatedDocumentCount().subscribe(toSubscriber { count.complete(it) })
     })
-    return count.join()
+    return count.get(30, TimeUnit.SECONDS)
   }
 
   @Override
@@ -103,11 +119,11 @@ class Mongo4ReactiveClientTest extends AbstractMongoClientTest<MongoCollection<D
       MongoDatabase db = client.getDatabase(dbName)
       def latch1 = new CountDownLatch(1)
       db.createCollection(collectionName).subscribe(toSubscriber { latch1.countDown() })
-      latch1.await()
+      latch1.await(30, TimeUnit.SECONDS)
       def coll = db.getCollection(collectionName)
       def latch2 = new CountDownLatch(1)
       coll.insertOne(new Document("password", "OLDPW")).subscribe(toSubscriber { latch2.countDown() })
-      latch2.await()
+      latch2.await(30, TimeUnit.SECONDS)
       return coll
     }
     ignoreTracesAndClear(1)
@@ -124,7 +140,7 @@ class Mongo4ReactiveClientTest extends AbstractMongoClientTest<MongoCollection<D
       result.complete(it)
       collection.estimatedDocumentCount().subscribe(toSubscriber { count.complete(it) })
     })
-    return result.join().modifiedCount
+    return result.get(30, TimeUnit.SECONDS).modifiedCount
   }
 
   @Override
@@ -133,11 +149,11 @@ class Mongo4ReactiveClientTest extends AbstractMongoClientTest<MongoCollection<D
       MongoDatabase db = client.getDatabase(dbName)
       def latch1 = new CountDownLatch(1)
       db.createCollection(collectionName).subscribe(toSubscriber { latch1.countDown() })
-      latch1.await()
+      latch1.await(30, TimeUnit.SECONDS)
       def coll = db.getCollection(collectionName)
       def latch2 = new CountDownLatch(1)
       coll.insertOne(new Document("password", "SECRET")).subscribe(toSubscriber { latch2.countDown() })
-      latch2.await()
+      latch2.await(30, TimeUnit.SECONDS)
       return coll
     }
     ignoreTracesAndClear(1)
@@ -152,7 +168,7 @@ class Mongo4ReactiveClientTest extends AbstractMongoClientTest<MongoCollection<D
       result.complete(it)
       collection.estimatedDocumentCount().subscribe(toSubscriber { count.complete(it) })
     })
-    return result.join().deletedCount
+    return result.get(30, TimeUnit.SECONDS).deletedCount
   }
 
   @Override
@@ -173,7 +189,7 @@ class Mongo4ReactiveClientTest extends AbstractMongoClientTest<MongoCollection<D
       db.createCollection(collectionName).subscribe(toSubscriber {
         latch.countDown()
       })
-      latch.await()
+      latch.await(30, TimeUnit.SECONDS)
       return db.getCollection(collectionName)
     }
     ignoreTracesAndClear(1)
@@ -181,10 +197,10 @@ class Mongo4ReactiveClientTest extends AbstractMongoClientTest<MongoCollection<D
     collection.updateOne(new BsonDocument(), new BsonDocument()).subscribe(toSubscriber {
       result.complete(it)
     })
-    throw result.join()
+    throw result.get(30, TimeUnit.SECONDS)
   }
 
-  def Subscriber<?> toSubscriber(Closure closure) {
+  Subscriber<?> toSubscriber(Closure closure) {
     return new Subscriber() {
       boolean hasResult