diff --git a/src/test/java/com/zaxxer/hikari/pool/TestJNDI.java b/src/test/java/com/zaxxer/hikari/pool/TestJNDI.java
index 48d86988..404c9312 100644
--- a/src/test/java/com/zaxxer/hikari/pool/TestJNDI.java
+++ b/src/test/java/com/zaxxer/hikari/pool/TestJNDI.java
@@ -46,9 +46,10 @@ public class TestJNDI
       ref.add(new BogusRef("dataSource.loginTimeout", "10"));
       Context nameCtx = new BogusContext();
 
-      HikariDataSource ds = (HikariDataSource) jndi.getObjectInstance(ref, null, nameCtx, null);
-      Assert.assertNotNull(ds);
-      Assert.assertEquals("foo", ds.getUsername());
+      try (HikariDataSource ds = (HikariDataSource) jndi.getObjectInstance(ref, null, nameCtx, null)) {
+         Assert.assertNotNull(ds);
+         Assert.assertEquals("foo", ds.getUsername());
+      }
    }
 
    @Test
@@ -67,9 +68,10 @@ public class TestJNDI
       ref.add(new BogusRef("dataSource.loginTimeout", "10"));
       Context nameCtx = new BogusContext2();
 
-      HikariDataSource ds = (HikariDataSource) jndi.getObjectInstance(ref, null, nameCtx, null);
-      Assert.assertNotNull(ds);
-      Assert.assertEquals("foo", ds.getUsername());
+      try (HikariDataSource ds = (HikariDataSource) jndi.getObjectInstance(ref, null, nameCtx, null)) {
+         Assert.assertNotNull(ds);
+         Assert.assertEquals("foo", ds.getUsername());
+      }
    }
 
    @Test