diff --git a/java/test/jmri/configurexml/BlockManagerXmlTest.java b/java/test/jmri/configurexml/BlockManagerXmlTest.java
index 60fcade8774..d01d70d6df7 100644
--- a/java/test/jmri/configurexml/BlockManagerXmlTest.java
+++ b/java/test/jmri/configurexml/BlockManagerXmlTest.java
@@ -444,6 +444,7 @@ public static Test suite() {
     @Override
     protected void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @Override
diff --git a/java/test/jmri/configurexml/ConfigXmlManagerTest.java b/java/test/jmri/configurexml/ConfigXmlManagerTest.java
index 4424f475a45..83968d6f738 100644
--- a/java/test/jmri/configurexml/ConfigXmlManagerTest.java
+++ b/java/test/jmri/configurexml/ConfigXmlManagerTest.java
@@ -179,6 +179,7 @@ public static Test suite() {
     @Override
     protected void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @Override
diff --git a/java/test/jmri/configurexml/DccLocoAddressXmlTest.java b/java/test/jmri/configurexml/DccLocoAddressXmlTest.java
index 85e532ca6b0..25bb566ea31 100644
--- a/java/test/jmri/configurexml/DccLocoAddressXmlTest.java
+++ b/java/test/jmri/configurexml/DccLocoAddressXmlTest.java
@@ -24,6 +24,7 @@ public void testCtor(){
     @Before
     public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @After
diff --git a/java/test/jmri/configurexml/DefaultClassMigrationTest.java b/java/test/jmri/configurexml/DefaultClassMigrationTest.java
index 2b0cb0266a4..1fd256f4813 100644
--- a/java/test/jmri/configurexml/DefaultClassMigrationTest.java
+++ b/java/test/jmri/configurexml/DefaultClassMigrationTest.java
@@ -22,6 +22,7 @@ public void testCTor() {
     @Before
     public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @After
diff --git a/java/test/jmri/configurexml/DefaultJavaBeanConfigXMLTest.java b/java/test/jmri/configurexml/DefaultJavaBeanConfigXMLTest.java
index 8251d66f5a1..ae07e487919 100644
--- a/java/test/jmri/configurexml/DefaultJavaBeanConfigXMLTest.java
+++ b/java/test/jmri/configurexml/DefaultJavaBeanConfigXMLTest.java
@@ -77,6 +77,7 @@ public static Test suite() {
     @Override
     protected void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @Override
diff --git a/java/test/jmri/configurexml/ErrorHandlerTest.java b/java/test/jmri/configurexml/ErrorHandlerTest.java
index 45131ee3cb7..d52047c8514 100644
--- a/java/test/jmri/configurexml/ErrorHandlerTest.java
+++ b/java/test/jmri/configurexml/ErrorHandlerTest.java
@@ -22,6 +22,7 @@ public void testCTor() {
     @Before
     public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @After
diff --git a/java/test/jmri/configurexml/ErrorMemoTest.java b/java/test/jmri/configurexml/ErrorMemoTest.java
index d8d6be61cef..bba3f17076a 100644
--- a/java/test/jmri/configurexml/ErrorMemoTest.java
+++ b/java/test/jmri/configurexml/ErrorMemoTest.java
@@ -22,6 +22,7 @@ public void testCTor() {
     @Before
     public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @After
diff --git a/java/test/jmri/configurexml/JmriConfigureXmlExceptionTest.java b/java/test/jmri/configurexml/JmriConfigureXmlExceptionTest.java
index 15fe93b6b7e..3bd1c7a9392 100644
--- a/java/test/jmri/configurexml/JmriConfigureXmlExceptionTest.java
+++ b/java/test/jmri/configurexml/JmriConfigureXmlExceptionTest.java
@@ -27,6 +27,7 @@ public void StringConstructorTest(){
    @Before
    public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
 
         jmri.util.JUnitUtil.initDefaultUserMessagePreferences();
    }
diff --git a/java/test/jmri/configurexml/LoadXmlConfigActionTest.java b/java/test/jmri/configurexml/LoadXmlConfigActionTest.java
index 73f1d24a865..742aa2f4d06 100644
--- a/java/test/jmri/configurexml/LoadXmlConfigActionTest.java
+++ b/java/test/jmri/configurexml/LoadXmlConfigActionTest.java
@@ -22,6 +22,7 @@ public void testCTor() {
     @Before
     public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @After
diff --git a/java/test/jmri/configurexml/LoadXmlUserActionTest.java b/java/test/jmri/configurexml/LoadXmlUserActionTest.java
index 7e8a0e22fa9..8a9da08bd43 100644
--- a/java/test/jmri/configurexml/LoadXmlUserActionTest.java
+++ b/java/test/jmri/configurexml/LoadXmlUserActionTest.java
@@ -21,6 +21,7 @@ public void testCTor() {
     // The minimal setup for log4J
     @Before
     public void setUp() {
+        JUnitUtil.resetProfileManager();
         JUnitUtil.setUp();
     }
 
diff --git a/java/test/jmri/configurexml/SchemaTestBase.java b/java/test/jmri/configurexml/SchemaTestBase.java
index ac2141f2d67..a92e3a7d075 100644
--- a/java/test/jmri/configurexml/SchemaTestBase.java
+++ b/java/test/jmri/configurexml/SchemaTestBase.java
@@ -113,6 +113,7 @@ public static Collection<Object[]> getDirectories(File directory, boolean recurs
     @Before
     public void setUp() throws Exception {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
         this.validate = XmlFile.getDefaultValidate();
     }
 
diff --git a/java/test/jmri/configurexml/SectionManagerXmlTest.java b/java/test/jmri/configurexml/SectionManagerXmlTest.java
index 234cb9e0ddc..7cac9063fa7 100644
--- a/java/test/jmri/configurexml/SectionManagerXmlTest.java
+++ b/java/test/jmri/configurexml/SectionManagerXmlTest.java
@@ -551,6 +551,7 @@ public static Test suite() {
     @Override
     protected void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @Override
diff --git a/java/test/jmri/configurexml/StoreXmlAllActionTest.java b/java/test/jmri/configurexml/StoreXmlAllActionTest.java
index 83da726ea7b..6af0cd35398 100644
--- a/java/test/jmri/configurexml/StoreXmlAllActionTest.java
+++ b/java/test/jmri/configurexml/StoreXmlAllActionTest.java
@@ -22,7 +22,7 @@ public void testCTor() {
     @Before
     public void setUp() {
         JUnitUtil.setUp();
-        jmri.util.JUnitUtil.resetProfileManager();
+        JUnitUtil.resetProfileManager();
     }
 
     @After
diff --git a/java/test/jmri/configurexml/StoreXmlConfigActionTest.java b/java/test/jmri/configurexml/StoreXmlConfigActionTest.java
index 525a6266e8e..59742a84e50 100644
--- a/java/test/jmri/configurexml/StoreXmlConfigActionTest.java
+++ b/java/test/jmri/configurexml/StoreXmlConfigActionTest.java
@@ -22,7 +22,7 @@ public void testCTor() {
     @Before
     public void setUp() {
         JUnitUtil.setUp();
-        jmri.util.JUnitUtil.resetProfileManager();
+        JUnitUtil.resetProfileManager();
     }
 
     @After
diff --git a/java/test/jmri/configurexml/StoreXmlUserActionTest.java b/java/test/jmri/configurexml/StoreXmlUserActionTest.java
index df9f742c29b..454bc0b9772 100644
--- a/java/test/jmri/configurexml/StoreXmlUserActionTest.java
+++ b/java/test/jmri/configurexml/StoreXmlUserActionTest.java
@@ -22,6 +22,7 @@ public void testCTor() {
     @Before
     public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @After
diff --git a/java/test/jmri/configurexml/TransitManagerXmlTest.java b/java/test/jmri/configurexml/TransitManagerXmlTest.java
index 386e3de92d6..20161ac03fa 100644
--- a/java/test/jmri/configurexml/TransitManagerXmlTest.java
+++ b/java/test/jmri/configurexml/TransitManagerXmlTest.java
@@ -51,6 +51,7 @@ public void StoreOneTransitTest() throws Exception {
    @Before
    public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
 
         jmri.util.JUnitUtil.initDefaultUserMessagePreferences();
    }
diff --git a/java/test/jmri/configurexml/TurnoutOperationManagerXmlTest.java b/java/test/jmri/configurexml/TurnoutOperationManagerXmlTest.java
index 3d487341b0f..0a7b8df47ef 100644
--- a/java/test/jmri/configurexml/TurnoutOperationManagerXmlTest.java
+++ b/java/test/jmri/configurexml/TurnoutOperationManagerXmlTest.java
@@ -22,6 +22,7 @@ public void testCTor() {
     @Before
     public void setUp() {
         JUnitUtil.setUp();
+        JUnitUtil.resetProfileManager();
     }
 
     @After