diff --git a/src/test/java/org/jenkinsci/plugins/badge/ImageResolverTest.java b/src/test/java/org/jenkinsci/plugins/badge/ImageResolverTest.java
index 9f510322..98abef9a 100644
--- a/src/test/java/org/jenkinsci/plugins/badge/ImageResolverTest.java
+++ b/src/test/java/org/jenkinsci/plugins/badge/ImageResolverTest.java
@@ -24,54 +24,57 @@ public class ImageResolverTest {
 
     @Test
     public void TestGetDefault32x32Ball() throws Exception {
-        JenkinsRule.WebClient wc = jenkinsRule.createWebClient();
-        String style = "ball"; // should give default due to invalid size in the style
-        String subject = getSubject();
-        String status = getStatus();
-        String colorName = null;
-        BallColor ball = BallColor.BLUE;
-        StatusImage image = wc.executeOnServer(() -> {
-            ImageResolver imageResolver = new ImageResolver();
-            return imageResolver.getImage(ball, style, subject, status, colorName, null, null);
-        });
-        assertThat(image.getEtag(), containsString(subject));
-        assertThat(image.getEtag(), containsString(status));
-        assertThat(image.getEtag(), containsString("null"));
+        try (JenkinsRule.WebClient wc = jenkinsRule.createWebClient()) {
+            String style = "ball"; // should give default due to invalid size in the style
+            String subject = getSubject();
+            String status = getStatus();
+            String colorName = null;
+            BallColor ball = BallColor.BLUE;
+            StatusImage image = wc.executeOnServer(() -> {
+                ImageResolver imageResolver = new ImageResolver();
+                return imageResolver.getImage(ball, style, subject, status, colorName, null, null);
+            });
+            assertThat(image.getEtag(), containsString(subject));
+            assertThat(image.getEtag(), containsString(status));
+            assertThat(image.getEtag(), containsString("null"));
+        }
     }
 
     @Test
     public void TestGetNonDefaultBall() throws Exception {
-        JenkinsRule.WebClient wc = jenkinsRule.createWebClient();
-        String sizeHint = "16x16";
-        String style = "ball-" + sizeHint; // should give url
-        String subject = getSubject();
-        String status = getStatus();
-        BallColor ball = BallColor.RED;
-        String colorName = ball.toString();
-        StatusImage image = wc.executeOnServer(() -> {
-            ImageResolver imageResolver = new ImageResolver();
-            return imageResolver.getImage(ball, style, subject, status, colorName, null, null);
-        });
-        assertThat(image.getEtag(), not(containsString(subject)));
-        assertThat(image.getEtag(), not(containsString(status)));
-        assertThat(image.getEtag(), containsString("images/" + sizeHint + "/" + colorName + ".png"));
+        try (JenkinsRule.WebClient wc = jenkinsRule.createWebClient()) {
+            String sizeHint = "16x16";
+            String style = "ball-" + sizeHint; // should give url
+            String subject = getSubject();
+            String status = getStatus();
+            BallColor ball = BallColor.RED;
+            String colorName = ball.toString();
+            StatusImage image = wc.executeOnServer(() -> {
+                ImageResolver imageResolver = new ImageResolver();
+                return imageResolver.getImage(ball, style, subject, status, colorName, null, null);
+            });
+            assertThat(image.getEtag(), not(containsString(subject)));
+            assertThat(image.getEtag(), not(containsString(status)));
+            assertThat(image.getEtag(), containsString("images/" + sizeHint + "/" + colorName + ".png"));
+        }
     }
 
     @Test
     public void testShouldReturnEmpty() throws Exception {
-        JenkinsRule.WebClient wc = jenkinsRule.createWebClient();
-        String style = "ball-42x45"; // invalid size hint will return default empty image
-        String subject = getSubject();
-        String status = getStatus();
-        String colorName = null;
-        BallColor ball = BallColor.BLUE;
-        StatusImage image = wc.executeOnServer(() -> {
-            ImageResolver imageResolver = new ImageResolver();
-            return imageResolver.getImage(ball, style, subject, status, colorName, null, null);
-        });
-        assertThat(image.getEtag(), not(containsString(subject)));
-        assertThat(image.getEtag(), not(containsString(status)));
-        assertThat(image.getEtag(), containsString("empty"));
+        try (JenkinsRule.WebClient wc = jenkinsRule.createWebClient()) {
+            String style = "ball-42x45"; // invalid size hint will return default empty image
+            String subject = getSubject();
+            String status = getStatus();
+            String colorName = null;
+            BallColor ball = BallColor.BLUE;
+            StatusImage image = wc.executeOnServer(() -> {
+                ImageResolver imageResolver = new ImageResolver();
+                return imageResolver.getImage(ball, style, subject, status, colorName, null, null);
+            });
+            assertThat(image.getEtag(), not(containsString(subject)));
+            assertThat(image.getEtag(), not(containsString(status)));
+            assertThat(image.getEtag(), containsString("empty"));
+        }
     }
 
     private final Random random = new Random();
diff --git a/src/test/java/org/jenkinsci/plugins/badge/actions/PublicBuildStatusActionTest.java b/src/test/java/org/jenkinsci/plugins/badge/actions/PublicBuildStatusActionTest.java
index a22070ae..4e536bc8 100644
--- a/src/test/java/org/jenkinsci/plugins/badge/actions/PublicBuildStatusActionTest.java
+++ b/src/test/java/org/jenkinsci/plugins/badge/actions/PublicBuildStatusActionTest.java
@@ -34,7 +34,6 @@ public class PublicBuildStatusActionTest {
 
     private FreeStyleProject job;
     private String jobStatusUrl;
-    private JenkinsRule.WebClient webClient;
 
     @Before
     public void createJob() throws IOException {
@@ -52,19 +51,16 @@ public void createJob() throws IOException {
         jobStatusUrl = statusUrl + "?job=" + job.getName();
     }
 
-    @Before
-    public void createWebClient() {
-        webClient = j.createWebClient();
-    }
-
     @Test
     public void testDoIconJobBefore() throws Exception {
         // Check job status icon is "not run" before job runs
-        JenkinsRule.JSONWebResponse json = webClient.getJSON(jobStatusUrl);
-        String result = json.getContentAsString();
-        assertThat(result, containsString("<svg "));
-        assertThat(result, not(containsString(SUCCESS_MARKER)));
-        assertThat(result, containsString(NOT_RUN_MARKER));
+        try (JenkinsRule.WebClient webClient = j.createWebClient()) {
+            JenkinsRule.JSONWebResponse json = webClient.getJSON(jobStatusUrl);
+            String result = json.getContentAsString();
+            assertThat(result, containsString("<svg "));
+            assertThat(result, not(containsString(SUCCESS_MARKER)));
+            assertThat(result, containsString(NOT_RUN_MARKER));
+        }
     }
 
     @Test
@@ -72,11 +68,13 @@ public void testDoIconBuildBefore() throws Exception {
         String buildStatusUrl = jobStatusUrl + "&build=123";
 
         // Check build status icon is "not run" before job runs
-        JenkinsRule.JSONWebResponse json = webClient.getJSON(buildStatusUrl);
-        String result = json.getContentAsString();
-        assertThat(result, containsString("<svg "));
-        assertThat(result, not(containsString(SUCCESS_MARKER)));
-        assertThat(result, containsString(NOT_RUN_MARKER));
+        try (JenkinsRule.WebClient webClient = j.createWebClient()) {
+            JenkinsRule.JSONWebResponse json = webClient.getJSON(buildStatusUrl);
+            String result = json.getContentAsString();
+            assertThat(result, containsString("<svg "));
+            assertThat(result, not(containsString(SUCCESS_MARKER)));
+            assertThat(result, containsString(NOT_RUN_MARKER));
+        }
     }
 
     @Test
@@ -86,11 +84,13 @@ public void testDoIconJobAfter() throws Exception {
         j.assertBuildStatusSuccess(build);
 
         // Check job status icon is correct after job runs successfully
-        JenkinsRule.JSONWebResponse json = webClient.getJSON(jobStatusUrl);
-        String result = json.getContentAsString();
-        assertThat(result, containsString("<svg "));
-        assertThat(result, containsString(SUCCESS_MARKER));
-        assertThat(result, not(containsString(NOT_RUN_MARKER)));
+        try (JenkinsRule.WebClient webClient = j.createWebClient()) {
+            JenkinsRule.JSONWebResponse json = webClient.getJSON(jobStatusUrl);
+            String result = json.getContentAsString();
+            assertThat(result, containsString("<svg "));
+            assertThat(result, containsString(SUCCESS_MARKER));
+            assertThat(result, not(containsString(NOT_RUN_MARKER)));
+        }
     }
 
     @Test
@@ -101,11 +101,13 @@ public void testDoIconBuildAfter() throws Exception {
 
         // Check build status icon is correct after job runs successfully
         String buildStatusUrl = jobStatusUrl + "&build=" + build.getNumber();
-        JenkinsRule.JSONWebResponse json = webClient.getJSON(buildStatusUrl);
-        String result = json.getContentAsString();
-        assertThat(result, containsString("<svg "));
-        assertThat(result, containsString(SUCCESS_MARKER));
-        assertThat(result, not(containsString(NOT_RUN_MARKER)));
+        try (JenkinsRule.WebClient webClient = j.createWebClient()) {
+            JenkinsRule.JSONWebResponse json = webClient.getJSON(buildStatusUrl);
+            String result = json.getContentAsString();
+            assertThat(result, containsString("<svg "));
+            assertThat(result, containsString(SUCCESS_MARKER));
+            assertThat(result, not(containsString(NOT_RUN_MARKER)));
+        }
     }
 
     @Test