diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
index bd5836e162..b5f6b30d0a 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
@@ -264,7 +264,9 @@ public abstract class ActiveMQTestBase extends Assert {
    public ActiveMQTestBase() {
       File parent = new File(TARGET_TMP);
       parent.mkdirs();
-      temporaryFolder = new TemporaryFolder(parent);
+      File subParent = new File(parent, this.getClass().getSimpleName());
+      subParent.mkdirs();
+      temporaryFolder = new TemporaryFolder(subParent);
    }
 
    protected <T> T serialClone(Object object) throws Exception {
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/NoProcessFilesBehind.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/NoProcessFilesBehind.java
index c9e6dadefe..527ffb2135 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/NoProcessFilesBehind.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/NoProcessFilesBehind.java
@@ -139,7 +139,7 @@ public class NoProcessFilesBehind extends TestWatcher {
 
       if (!Wait.waitFor(() -> getOpenFD() < maxFiles, 5000, 0)) {
          String fileList = getOpenList();
-         Assert.fail("Too many files open (" + maxFiles + "). A possible list: " + fileList);
+         Assert.fail("Too many files open (" + getOpenFD()  + ">" + maxFiles + "). A possible list: " + fileList);
       }
 
    }