diff --git a/playwright/src/test/java/com/microsoft/playwright/Server.java b/playwright/src/test/java/com/microsoft/playwright/Server.java
index ca751d20..0d98bf32 100644
--- a/playwright/src/test/java/com/microsoft/playwright/Server.java
+++ b/playwright/src/test/java/com/microsoft/playwright/Server.java
@@ -165,8 +165,6 @@ public class Server implements HttpHandler {
         exchange.sendResponseHeaders(401, 0);
         try (Writer writer = new OutputStreamWriter(exchange.getResponseBody())) {
           writer.write("HTTP Error 401 Unauthorized: Access is denied");
-          // TODO: notify subscriber?
-          exchange.getResponseBody().close();
         }
         return;
       }
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCredentials.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCredentials.java
index bf68095b..55b62b4d 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCredentials.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextCredentials.java
@@ -32,11 +32,8 @@ public class TestBrowserContextCredentials extends TestBase {
   @DisabledIf(value="isChromiumHeadful", disabledReason="fail")
   void shouldFailWithoutCredentials() {
     server.setAuth("/empty.html", "user", "pass");
-    BrowserContext context = browser.newContext();
-    Page page = context.newPage();
     Response response = page.navigate(server.EMPTY_PAGE);
     assertEquals(401, response.status());
-    context.close();
   }
 
   void shouldWorkWithSetHTTPCredentials() {
@@ -46,34 +43,35 @@ public class TestBrowserContextCredentials extends TestBase {
   @Test
   void shouldWorkWithCorrectCredentials() {
     server.setAuth("/empty.html", "user", "pass");
-    BrowserContext context = browser.newContext(new Browser.NewContextOptions()
-      .setHttpCredentials("user", "pass"));
-    Page page = context.newPage();
-    Response response = page.navigate(server.EMPTY_PAGE);
-    assertEquals(200, response.status());
-    context.close();
+    try (BrowserContext context = browser.newContext(new Browser.NewContextOptions()
+      .setHttpCredentials("user", "pass"))) {
+      Page page = context.newPage();
+      Response response = page.navigate(server.EMPTY_PAGE);
+      assertEquals(200, response.status());
+    }
   }
 
   @Test
   void shouldFailWithWrongCredentials() {
     server.setAuth("/empty.html", "user", "pass");
-    BrowserContext context = browser.newContext(new Browser.NewContextOptions().setHttpCredentials("foo", "bar"));
-    Page page = context.newPage();
-    Response response = page.navigate(server.EMPTY_PAGE);
-    assertEquals(401, response.status());
-    context.close();
+    try (BrowserContext context = browser.newContext(new Browser.NewContextOptions()
+      .setHttpCredentials("foo", "bar"))) {
+      Page page = context.newPage();
+      Response response = page.navigate(server.EMPTY_PAGE);
+      assertEquals(401, response.status());
+    }
   }
 
   @Test
   void shouldReturnResourceBody() {
     server.setAuth("/playground.html", "user", "pass");
-    BrowserContext context = browser.newContext(new Browser.NewContextOptions()
-      .setHttpCredentials("user", "pass"));
-    Page page = context.newPage();
-    Response response = page.navigate(server.PREFIX + "/playground.html");
-    assertEquals(200, response.status());
-    assertEquals("Playground", page.title());
-    assertTrue(new String(response.body()).contains("Playground"));
-    context.close();
+    try (BrowserContext context = browser.newContext(new Browser.NewContextOptions()
+      .setHttpCredentials("user", "pass"))) {
+      Page page = context.newPage();
+      Response response = page.navigate(server.PREFIX + "/playground.html");
+      assertEquals(200, response.status());
+      assertEquals("Playground", page.title());
+      assertTrue(new String(response.body()).contains("Playground"));
+    }
   }
 }