3 files changed, 13 insertions, 5 deletions
diff --git a/storage/src/tests/common/metricstest.cpp b/storage/src/tests/common/metricstest.cpp
index 9c2c8289d58..5ee7d4633ad 100644
--- a/storage/src/tests/common/metricstest.cpp
+++ b/storage/src/tests/common/metricstest.cpp
@@ -83,8 +83,8 @@ MetricsTest::MetricsTest()
 }
 
 void MetricsTest::setUp() {
-    assert(system("rm -rf vdsroot") == 0);
-    _config.reset(new vdstestlib::DirConfig(getStandardConfig(true)));
+    _config.reset(new vdstestlib::DirConfig(getStandardConfig(true, "metricstest")));
+    assert(system(("rm -rf " + getRootFolder(*_config)).c_str()) == 0);
     try {
         _node.reset(new TestServiceLayerApp(DiskCount(4), NodeIndex(0),
                     _config->getConfigId()));
diff --git a/storage/src/tests/common/testhelper.cpp b/storage/src/tests/common/testhelper.cpp
index 214885fef7f..3ec189c573b 100644
--- a/storage/src/tests/common/testhelper.cpp
+++ b/storage/src/tests/common/testhelper.cpp
@@ -45,7 +45,12 @@ void addStorageDistributionConfig(vdstestlib::DirConfig& dc)
     }
 }
 
-vdstestlib::DirConfig getStandardConfig(bool storagenode) {
+std::string getRootFolder(vdstestlib::DirConfig & dc) {
+    std::string defaultValue("");
+    return dc.getConfig("stor-server").getValue("root_folder", defaultValue);
+}
+
+vdstestlib::DirConfig getStandardConfig(bool storagenode, const std::string & rootOfRoot) {
     std::string clusterName("storage");
     vdstestlib::DirConfig dc;
     vdstestlib::DirConfig::Config* config;
@@ -146,7 +151,8 @@ vdstestlib::DirConfig getStandardConfig(bool storagenode) {
     config->set("enable_dead_lock_detector_warnings", "false");
     config->set("max_merges_per_node", "25");
     config->set("max_merge_queue_size", "20");
-    vespalib::string rootFolder = (storagenode ? "vdsroot" : "vdsroot.distributor");
+    vespalib::string rootFolder = rootOfRoot + "_";
+    rootFolder += (storagenode ? "vdsroot" : "vdsroot.distributor");
     config->set("root_folder", rootFolder);
     config->set("is_distributor", (storagenode ? "false" : "true"));
     config = &dc.addConfig("stor-devices");
diff --git a/storage/src/tests/common/testhelper.h b/storage/src/tests/common/testhelper.h
index 988ebee2798..a833ce01321 100644
--- a/storage/src/tests/common/testhelper.h
+++ b/storage/src/tests/common/testhelper.h
@@ -40,7 +40,9 @@ void addFileConfig(vdstestlib::DirConfig& dc,
 
 void addStorageDistributionConfig(vdstestlib::DirConfig& dc);
 
-vdstestlib::DirConfig getStandardConfig(bool storagenode);
+vdstestlib::DirConfig getStandardConfig(bool storagenode, const std::string & rootFolder = "todo-make-unique");
+
+std::string getRootFolder(vdstestlib::DirConfig & dc);
 
 void addSlobrokConfig(vdstestlib::DirConfig& dc,
                       const mbus::Slobrok& slobrok);