diff --git a/java/test/org/openqa/selenium/bidi/storage/StorageCommandsTest.java b/java/test/org/openqa/selenium/bidi/storage/StorageCommandsTest.java
index 995e5756551f7..b2c2491ec18d2 100644
--- a/java/test/org/openqa/selenium/bidi/storage/StorageCommandsTest.java
+++ b/java/test/org/openqa/selenium/bidi/storage/StorageCommandsTest.java
@@ -18,10 +18,14 @@
 package org.openqa.selenium.bidi.storage;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.openqa.selenium.testing.Safely.safelyCall;
 
 import java.time.Instant;
 import java.util.Date;
 import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.openqa.selenium.Cookie;
@@ -33,7 +37,7 @@
 
 class StorageCommandsTest extends JupiterTestBase {
   private String cookiePage;
-  private static final Random random = new Random();
+  private static final Random random = ThreadLocalRandom.current();
 
   private Storage storage;
 
@@ -288,6 +292,13 @@ public void testAddCookiesWithDifferentPathsThatAreRelatedToOurs() {
     assertCookieIsNotPresentWithName("fish");
   }
 
+  @AfterEach
+  public void quitDriver() {
+    if (driver != null) {
+      driver.quit();
+    }
+  }
+
   private String generateUniqueKey() {
     return String.format("key_%d", random.nextInt());
   }