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 a3c1971c74..330b55af89 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
@@ -196,7 +196,7 @@ public abstract class ActiveMQTestBase extends Assert {
     *  your data even under ./target.
     *  Do not try to disable this rule! Fix your test! */
    @Rule
-   public NoFilesBehind noFilesBehind = new NoFilesBehind("data");
+   public NoFilesBehind noFilesBehind = new NoFilesBehind("data", "null");
 
    /** This will cleanup any system property changed inside tests */
    @Rule
@@ -406,10 +406,14 @@ public abstract class ActiveMQTestBase extends Assert {
       }
    }
 
+   @Before
+   public void setupTestDir() {
+      testDir = temporaryFolder.getRoot().getAbsolutePath();
+   }
+
    @Before
    public void setUp() throws Exception {
       sendMsgCount = 0;
-      testDir = temporaryFolder.getRoot().getAbsolutePath();
       clearDataRecreateServerDirs();
       OperationContextImpl.clearContext();
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
index 8972dae48a..8a87c98b96 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
@@ -130,6 +130,7 @@ public class MQTTTestSupport extends ActiveMQTestBase {
    @Override
    @Before
    public void setUp() throws Exception {
+      super.setUp();
       String basedir = basedir().getPath();
       System.setProperty("javax.net.ssl.trustStore", basedir + "/src/test/resources/client.keystore");
       System.setProperty("javax.net.ssl.trustStorePassword", "password");