diff --git a/container/src/test/java/org/jboss/forge/furnace/FurnaceImplTest.java b/container/src/test/java/org/jboss/forge/furnace/FurnaceImplTest.java
index a2964b61..28cdb252 100644
--- a/container/src/test/java/org/jboss/forge/furnace/FurnaceImplTest.java
+++ b/container/src/test/java/org/jboss/forge/furnace/FurnaceImplTest.java
@@ -26,60 +26,74 @@ public class FurnaceImplTest
    @Test(expected = IllegalArgumentException.class)
    public void shouldValidateAddRepositoryArgumentMode() throws Exception
    {
-      Furnace f = new FurnaceImpl();
-      f.addRepository(null, new File("."));
+      try (Furnace f = new FurnaceImpl())
+      {
+         f.addRepository(null, new File("."));
+      }
    }
 
    @Test(expected = IllegalArgumentException.class)
    public void shouldValidateAddRepositoryArgumentDirectory() throws Exception
    {
-      Furnace f = new FurnaceImpl();
-      f.addRepository(AddonRepositoryMode.IMMUTABLE, null);
+      try (Furnace f = new FurnaceImpl())
+      {
+         f.addRepository(AddonRepositoryMode.IMMUTABLE, null);
+      }
    }
 
    @Test(expected = IllegalArgumentException.class)
    public void shouldValidateAddRepositoryArgumentRepository() throws Exception
    {
-      Furnace f = new FurnaceImpl();
-      f.addRepository((AddonRepository) null);
+      try (Furnace f = new FurnaceImpl())
+      {
+         f.addRepository((AddonRepository) null);
+      }
    }
 
    @Test
    public void testAddMultipleDiskRepositoriesWithSameRootDirectoryIsIdempotent() throws Exception
    {
-      Furnace f = new FurnaceImpl();
-      AddonRepository repo1 = f.addRepository(AddonRepositoryMode.IMMUTABLE, new File("target"));
-      AddonRepository repo2 = f.addRepository(AddonRepositoryMode.IMMUTABLE, new File("target"));
-      Assert.assertEquals(repo1, repo2);
+      try (Furnace f = new FurnaceImpl())
+      {
+         AddonRepository repo1 = f.addRepository(AddonRepositoryMode.IMMUTABLE, new File("target"));
+         AddonRepository repo2 = f.addRepository(AddonRepositoryMode.IMMUTABLE, new File("target"));
+         Assert.assertEquals(repo1, repo2);
+      }
    }
 
    @Test
    public void shouldNotAllowMultipleRepositoriesWithSameRootDirectory() throws Exception
    {
-      Furnace f = new FurnaceImpl();
-      AddonRepository repo1 = f.addRepository(AddonRepositoryMode.IMMUTABLE, new File("target"));
-      AddonRepository repo2 = f.addRepository(new TestAddonRepository(new File("target")));
-      Assert.assertEquals(repo1, repo2);
+      try (Furnace f = new FurnaceImpl())
+      {
+         AddonRepository repo1 = f.addRepository(AddonRepositoryMode.IMMUTABLE, new File("target"));
+         AddonRepository repo2 = f.addRepository(new TestAddonRepository(new File("target")));
+         Assert.assertEquals(repo1, repo2);
+      }
    }
 
    @Test
    public void shouldAllowToAddDiskRepository() throws Exception
    {
-      Furnace f = new FurnaceImpl();
-      f.addRepository(AddonRepositoryMode.IMMUTABLE, new File("target"));
-      Assert.assertEquals(1, f.getRepositories().size());
+      try (Furnace f = new FurnaceImpl())
+      {
+         f.addRepository(AddonRepositoryMode.IMMUTABLE, new File("target"));
+         Assert.assertEquals(1, f.getRepositories().size());
+      }
    }
 
    @Test
    public void shouldAllowToAddCustomRepository() throws Exception
    {
-      Furnace f = new FurnaceImpl();
+      try (Furnace f = new FurnaceImpl())
+      {
 
-      AddonRepository repository = new TestAddonRepository(new File("target"));
-      f.addRepository(repository);
+         AddonRepository repository = new TestAddonRepository(new File("target"));
+         f.addRepository(repository);
 
-      Assert.assertEquals(1, f.getRepositories().size());
-      Assert.assertEquals(repository, f.getRepositories().get(0));
+         Assert.assertEquals(1, f.getRepositories().size());
+         Assert.assertEquals(repository, f.getRepositories().get(0));
+      }
    }
 
    private static class TestAddonRepository implements AddonRepository