diff --git a/maven/src/functionalTest/java/org/hibernate/tool/maven/TransformHbmTestIT.java b/maven/src/functionalTest/java/org/hibernate/tool/maven/TransformHbmTestIT.java
index 95da8c2c3..0196c7a37 100644
--- a/maven/src/functionalTest/java/org/hibernate/tool/maven/TransformHbmTestIT.java
+++ b/maven/src/functionalTest/java/org/hibernate/tool/maven/TransformHbmTestIT.java
@@ -46,7 +46,7 @@ private void writePomFile() throws Exception {
     }
     
     private void copyHbmFile() throws Exception {
-    	URL originUrl = TransformHbmTestIT.class.getResource("simple.hbm.xml");
+    	URL originUrl = getClass().getResource("simple.hbm.xml");
     	assertNotNull(originUrl);
     	Path originPath = Paths.get(Objects.requireNonNull(originUrl).toURI());
     	File destinationDir = new File(projectPath.toFile(), "src/main/resources/");
diff --git a/orm/src/main/java/org/hibernate/tool/internal/util/DummyDialect.java b/orm/src/main/java/org/hibernate/tool/internal/util/DummyDialect.java
index 41c1e6c82..3bac5f685 100644
--- a/orm/src/main/java/org/hibernate/tool/internal/util/DummyDialect.java
+++ b/orm/src/main/java/org/hibernate/tool/internal/util/DummyDialect.java
@@ -18,5 +18,4 @@ public int getDatabaseMinorVersion() {
         });
     }
 
-
 }
diff --git a/orm/src/test/java/org/hibernate/tool/internal/export/mapping/MappingExporterTest.java b/orm/src/test/java/org/hibernate/tool/internal/export/mapping/MappingExporterTest.java
index 90db0540a..5cc62943c 100644
--- a/orm/src/test/java/org/hibernate/tool/internal/export/mapping/MappingExporterTest.java
+++ b/orm/src/test/java/org/hibernate/tool/internal/export/mapping/MappingExporterTest.java
@@ -191,35 +191,43 @@ public void testMarshall() throws Exception {
 
     @Test
     public void testTransformBindings() throws Exception {
-        File simpleHbmXmlFile = new File(this.tempDir, "simple.hbm.xml");
-        Files.writeString(simpleHbmXmlFile.toPath(), SIMPLE_HBM_XML);
-        MappingBinder mappingBinder = new MappingBinder(
-                MappingBinder.class.getClassLoader()::getResourceAsStream,
-                UnsupportedFeatureHandling.ERROR);
-        Binding<JaxbHbmHibernateMapping> hbmBinding = mappingBinder.bind(
-                new FileInputStream(simpleHbmXmlFile),
-                new HbmXmlOrigin(simpleHbmXmlFile));
-        List<Binding<JaxbHbmHibernateMapping>> bindings = new ArrayList<>();
-        bindings.add(hbmBinding);
-        Method transformBindingsMethod = MappingExporter.class.getDeclaredMethod(
-                "transformBindings",
-                List.class);
-        assertNotNull(transformBindingsMethod);
-        transformBindingsMethod.setAccessible(true);
-        List<?> transformedBindings = (List<?>)transformBindingsMethod.invoke(mappingExporter, bindings);
-        assertNotNull(transformedBindings);
-        assertEquals(1, transformedBindings.size());
-        Object object = transformedBindings.get(0);
-        assertInstanceOf(Binding.class, object);
-        Binding<?> entityBinding = (Binding<?>)object;
-        Origin origin = entityBinding.getOrigin();
-        assertInstanceOf(HbmXmlOrigin.class, origin);
-        assertSame(simpleHbmXmlFile, ((HbmXmlOrigin)origin).getHbmXmlFile());
-        Object root = entityBinding.getRoot();
-        assertInstanceOf(JaxbEntityMappingsImpl.class, root);
-        JaxbEntityMappingsImpl entityMappings = (JaxbEntityMappingsImpl)root;
-        assertEquals(1, entityMappings.getEntities().size());
-        assertEquals("Foo", entityMappings.getEntities().get(0).getClazz());
+        FileInputStream simpleHbmXmlInputStream = null;
+        try {
+            File simpleHbmXmlFile = new File( this.tempDir, "simple.hbm.xml" );
+            Files.writeString( simpleHbmXmlFile.toPath(), SIMPLE_HBM_XML );
+            MappingBinder mappingBinder = new MappingBinder(
+                    MappingBinder.class.getClassLoader()::getResourceAsStream,
+                    UnsupportedFeatureHandling.ERROR );
+            simpleHbmXmlInputStream = new FileInputStream( simpleHbmXmlFile );
+            Binding<JaxbHbmHibernateMapping> hbmBinding = mappingBinder.bind(
+                    simpleHbmXmlInputStream,
+                    new HbmXmlOrigin( simpleHbmXmlFile ) );
+            List<Binding<JaxbHbmHibernateMapping>> bindings = new ArrayList<>();
+            bindings.add( hbmBinding );
+            Method transformBindingsMethod = MappingExporter.class.getDeclaredMethod(
+                    "transformBindings",
+                    List.class );
+            assertNotNull( transformBindingsMethod );
+            transformBindingsMethod.setAccessible( true );
+            List<?> transformedBindings = (List<?>) transformBindingsMethod.invoke( mappingExporter, bindings );
+            assertNotNull( transformedBindings );
+            assertEquals( 1, transformedBindings.size() );
+            Object object = transformedBindings.get( 0 );
+            assertInstanceOf( Binding.class, object );
+            Binding<?> entityBinding = (Binding<?>) object;
+            Origin origin = entityBinding.getOrigin();
+            assertInstanceOf( HbmXmlOrigin.class, origin );
+            assertSame( simpleHbmXmlFile, ((HbmXmlOrigin) origin).getHbmXmlFile() );
+            Object root = entityBinding.getRoot();
+            assertInstanceOf( JaxbEntityMappingsImpl.class, root );
+            JaxbEntityMappingsImpl entityMappings = (JaxbEntityMappingsImpl) root;
+            assertEquals( 1, entityMappings.getEntities().size() );
+            assertEquals( "Foo", entityMappings.getEntities().get( 0 ).getClazz() );
+        } finally {
+            if ( simpleHbmXmlInputStream != null ) {
+                simpleHbmXmlInputStream.close();
+            }
+        }
     }
 
     @Test