--- a/tests/test-utils/src/main/java/com/redhat/thermostat/gateway/tests/utils/MongodTestUtil.java	Tue Oct 10 11:58:42 2017 +0200
+++ b/tests/test-utils/src/main/java/com/redhat/thermostat/gateway/tests/utils/MongodTestUtil.java	Tue Oct 17 08:38:18 2017 -0400
@@ -126,20 +126,43 @@
     }
 
     private void finish() throws IOException {
-        Files.walkFileTree(tempDbDir, new SimpleFileVisitor<Path>() {
-            @Override
-            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-                Files.delete(file);
-                return FileVisitResult.CONTINUE;
-            }
+
+        // some environments (Windows) may still have the file marked as in use for a few seconds
+        // this code retries a few times, then gives up.
+
+        final int NUM_RETRIES = 5;
+        final int WAIT_TIME_MILLIS = 1000;
+        IOException savedException = null;
+        for (int i = NUM_RETRIES; i > 0; i--) {
+            try {
+                Files.walkFileTree(tempDbDir, new SimpleFileVisitor<Path>() {
+                    @Override
+                    public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                        Files.delete(file);
+                        return FileVisitResult.CONTINUE;
+                    }
 
-            @Override
-            public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
-                Files.delete(dir);
-                return FileVisitResult.CONTINUE;
+                    @Override
+                    public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+                        Files.delete(dir);
+                        return FileVisitResult.CONTINUE;
+                    }
+
+                });
+                savedException = null;
+                break;
+            } catch (IOException fsException) {
+                savedException = fsException;
+                try {
+                    Thread.sleep(WAIT_TIME_MILLIS);
+                } catch (InterruptedException ignored) {
+                    // we don't really care if we got interrupted as we'll try this a few times
+                }
             }
-
-        });
+        }
+        if (savedException != null) {
+            throw savedException;
+        }
     }
 
     private void waitForSocketToBind(String host, int port) throws InterruptedException {