diff --git a/test/test_execmodes.cc b/test/test_execmodes.cc
index 7b33ddc..584c897 100644
--- a/test/test_execmodes.cc
+++ b/test/test_execmodes.cc
@@ -21,9 +21,6 @@ int main(int argc, char* argv[])
         // DEBUG Logging of PityTestUnit itself
         PityUnit<>::debug_log_enabled = false;
 
-        // Configure DataRoot for all TestNodes
-        PityUnit<>::setGlobalRootDir("./basic_data_root");
-
         // The RootNode is the
         PityUnit<> root = PityUnit<>{ nullptr, "Test Execution Model" };
 
diff --git a/test/test_processdirs.cc b/test/test_processdirs.cc
index 819bf3e..b0d0836 100644
--- a/test/test_processdirs.cc
+++ b/test/test_processdirs.cc
@@ -17,34 +17,33 @@ void printHomeDir(const PityUnit<>& myself)
 int main(int argc, char* argv[])
 {
     PityUnit<>::debug_log_enabled = false;
-    PityUnit<>::setGlobalRootDir("./");
-    PityUnit<> root = PityUnit<>{ nullptr, "rootnode" };
+    PityUnit<> root = PityUnit<>{ nullptr, "test_processdirs" };
 
     // 1
     PityUnit<> test1 = PityUnit<>{ &root, "node 1", [](const PityUnit<>& mynode) {
-                                      PTASSERT(mynode.processDir() == "./rootnode/");
+                                      PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/");
                                   } };
 
     PityUnit<> test1_1 = PityUnit<>{ &test1, "node 1.1", [](const PityUnit<>& mynode) {
-                                        PTASSERT(mynode.processDir() == "./rootnode/");
+                                        PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/");
                                     } };
 
     // 2
     PityUnit<> test2 = PityUnit<>{ &root, "node 2", [](const PityUnit<>& mynode) {
-                                      PTASSERT(mynode.processDir() == "./rootnode/");
+                                      PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/");
                                   } };
 
     PityUnit<> test2_1 = PityUnit<>{ &test2,
                                      "node 2.1",
                                      [](const PityUnit<>& mynode) {
-                                         PTASSERT(mynode.processDir() == "./rootnode/node_2_1/");
+                                         PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_2_1/");
                                      },
                                      nullptr,
                                      pEp::PityTest11::PityUnit<>::ExecutionMode::PROCESS_PARALLEL };
 
 
     PityUnit<> test2_1_1 = PityUnit<>{ &test2_1, "node 2.1.1", [](PityUnit<> mynode) {
-                                          PTASSERT(mynode.processDir() == "./rootnode/node_2_1/");
+                                          PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_2_1/");
                                       } };
 
 
@@ -52,23 +51,23 @@ int main(int argc, char* argv[])
     PityUnit<> test3 = PityUnit<>{ &root,
                                    "node 3",
                                    [](const PityUnit<>& mynode) {
-                                       PTASSERT(mynode.processDir() == "./rootnode/node_3/");
+                                       PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3/");
                                    },
                                    nullptr,
                                    PityUnit<>::ExecutionMode::PROCESS_PARALLEL };
 
     PityUnit<> test3_1 = PityUnit<>{ &test3, "node 3.1", [](const PityUnit<>& mynode) {
-                                        PTASSERT(mynode.processDir() == "./rootnode/node_3/");
+                                        PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3/");
                                     } };
 
     PityUnit<> test3_1_1 = PityUnit<>{ &test3_1, "node 3.1.1", [](const PityUnit<>& mynode) {
-                                          PTASSERT(mynode.processDir() == "./rootnode/node_3/");
+                                          PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3/");
                                       } };
 
     PityUnit<> test3_1_1_1 = PityUnit<>{ &test3_1_1,
                                          "node 3.1.1",
                                          [](const PityUnit<>& mynode) {
-                                             PTASSERT(mynode.processDir() == "./rootnode/node_3_1_1/");
+                                             PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3_1_1/");
                                          },
                                          nullptr,
                                          PityUnit<>::ExecutionMode::PROCESS_PARALLEL };
@@ -76,7 +75,7 @@ int main(int argc, char* argv[])
     PityUnit<> test3_1_1_1_1 = PityUnit<>{ &test3_1_1_1,
                                          "node 3.1.1.1",
                                          [](const PityUnit<>& mynode) {
-                                             PTASSERT(mynode.processDir() == "./rootnode/node_3_1_1/");
+                                             PTASSERT(mynode.processDir() == "./pitytest_data/test_processdirs/node_3_1_1/");
                                          }};
 
     root.run();