diff --git a/roottest/.gitignore b/roottest/.gitignore
index edca0c52a7913..00546edbf345d 100644
--- a/roottest/.gitignore
+++ b/roottest/.gitignore
@@ -844,10 +844,6 @@ root/tree/addresses/converterIssues/ExtHit/ExtHitProjectDict.cxx
 /root/tree/selector/lhef_*_gen.C
 /root/tree/selector/lhef_*_gen.h
 
-
-# /root/tree/selectorreader/
-/root/tree/selectorreader/generated_selectors/
-
 # /root/tree/split/
 /root/tree/split/abstract.root
 /root/tree/split/customClassTree.root
diff --git a/roottest/root/tree/selector/.rootrc b/roottest/root/tree/selector/.rootrc
deleted file mode 100644
index 4dd83db9de472..0000000000000
--- a/roottest/root/tree/selector/.rootrc
+++ /dev/null
@@ -1,2 +0,0 @@
-ACLiC.LinkLibs: 1
-Rint.History:            .root_hist
diff --git a/roottest/root/tree/selector/CMakeLists.txt b/roottest/root/tree/selector/CMakeLists.txt
index 227297c2402a2..f62089d97376b 100644
--- a/roottest/root/tree/selector/CMakeLists.txt
+++ b/roottest/root/tree/selector/CMakeLists.txt
@@ -1,7 +1,38 @@
-#-------------------------------------------------------------------------------
-#
-# Placeholder file to translate the tests to the new CTest system. Meanwhile we
-# define a CTest test that calls 'make' in ${CMAKE_CURRENT_SOURCE_DIR}
-#
-#-------------------------------------------------------------------------------
-ROOTTEST_ADD_OLDTEST()
+ROOTTEST_ADD_TEST(copyfiles
+                  COMMAND ${CMAKE_COMMAND} -E echo "copy files"
+                  COPY_TO_BUILDDIR Event1.root Event2.root Event3.root
+                  FIXTURES_SETUP root-tree-selector-copyfiles-fixture)
+
+ROOTTEST_ADD_TEST(selector
+                  MACRO run.C
+                  OUTREF selector.ref
+                  OUTCNVCMD grep -v reloading
+                  FIXTURES_REQUIRED root-tree-selector-copyfiles-fixture)
+
+ROOTTEST_COMPILE_MACRO(sel01.C
+                       FIXTURES_SETUP root-tree-selector-sel01-fixture)
+
+ROOTTEST_ADD_TEST(SelectorCintTest
+                  MACRO runSelectorCintTest.C
+                  OUTREF SelectorCintTest.ref
+                  OUTCNVCMD grep -v unloading
+                  FIXTURES_REQUIRED root-tree-selector-sel01-fixture root-tree-selector-copyfiles-fixture)
+
+ROOTTEST_COMPILE_MACRO(emptysel.C
+                       FIXTURES_SETUP root-tree-selector-emptysel-fixture)
+
+ROOTTEST_ADD_TEST(GetSelector
+                  MACRO execGetSelector.C
+                  OUTREF execGetSelector.ref
+                  FIXTURES_REQUIRED root-tree-selector-emptysel-fixture)
+
+ROOTTEST_ADD_TEST(LHEF
+                  MACRO execLHEF.C
+                  OUTREF execLHEF.ref
+                  COPY_TO_BUILDDIR unweighted.root)
+
+ROOTTEST_ADD_TEST(WithAbort
+                  MACRO execWithAbort.C
+                  OUTREF execWithAbort.ref
+                  OUTCNVCMD grep -v reloading
+                  FIXTURES_REQUIRED root-tree-selector-copyfiles-fixture)
diff --git a/roottest/root/tree/selector/Makefile b/roottest/root/tree/selector/Makefile
deleted file mode 100644
index 172359178f9ab..0000000000000
--- a/roottest/root/tree/selector/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-TEST_TARGETS = SelectorTest SelectorCintTest
-CLEAN_TARGETS += *.log $(ALL_LIBRARIES) lhef*_gen.[Ch]
-
-ifeq ($(strip $(ROOTTEST_HOME)),)
-   export ROOTTEST_HOME := $(shell git rev-parse --show-toplevel)/roottest/
-   ifeq ($(strip $(ROOTTEST_HOME)),)
-      export ROOTTEST_HOME := $(shell expr $(CURDIR) : '\(.*/roottest/\)')
-   endif
-   ifeq ($(strip $(ROOTTEST_HOME)),)
-      $(error The head of roottest was not found.  Set ROOTTEST_HOME)
-   endif
-endif
-
-include $(ROOTTEST_HOME)/scripts/Rules.mk
-
-selector.log: run.C $(ROOTCORELIBS)
-	$(CMDECHO) $(CALLROOTEXE) -l -q -b run.C 2>&1 | grep -v reloading > selector.log
-
-ifeq ($(ClingWorkAroundUnloadingVTABLES),)
-execWithAbort.log: execWithAbort.C $(ROOTCORELIBS)
-	$(CMDECHO) $(CALLROOTEXE) -l -q -b execWithAbort.C 2>&1 | grep -v reloading > execWithAbort.log
-else
-execWithAbort.log:
-	$(CMDECHO) cp execWithAbort.ref execWithAbort.log
-endif
-
-electorTest: selector.log
-	$(CMDECHO) diff -b selector.ref selector.log
-
-SelectorCintTest.log: sel01_C.$(DllSuf) runSelectorCintTest.C $(ROOTCORELIBS)
-	$(CMDECHO) $(CALLROOTEXE) -q -l -b runSelectorCintTest.C 2>&1 | $(RemoveDirs) > $@ 
-
-SelectorCintTest: SelectorCintTest.log
-	$(TestDiffCintSpecific)
-
-execGetSelector.log: emptysel_C.$(DllSuf)
diff --git a/roottest/root/tree/selector/SelectorCintTest.ref b/roottest/root/tree/selector/SelectorCintTest.ref
index 724ec9871f922..410b72df248ba 100644
--- a/roottest/root/tree/selector/SelectorCintTest.ref
+++ b/roottest/root/tree/selector/SelectorCintTest.ref
@@ -24,7 +24,6 @@ Running Interpreted Process 7
 Running Interpreted Process 8
 Running Interpreted Process 9
 Info in <ACLiC>: script has already been loaded in interpreted mode
-Info in <ACLiC>: unloading sel01.C and compiling it
 Running Compiled Process 0
 Running Compiled Process 1
 Running Compiled Process 2
diff --git a/roottest/root/tree/selector/execWithAbort.ref b/roottest/root/tree/selector/execWithAbort.ref
index 7ac3b8297835d..107f2c9bb16e3 100644
--- a/roottest/root/tree/selector/execWithAbort.ref
+++ b/roottest/root/tree/selector/execWithAbort.ref
@@ -1,8 +1,8 @@
 
 Processing execWithAbort.C...
-Warning in <TClass::TClass>: no dictionary for class Event is available
-Warning in <TClass::TClass>: no dictionary for class EventHeader is available
-Warning in <TClass::TClass>: no dictionary for class Track is available
+Warning in <TClass::Init>: no dictionary for class Event is available
+Warning in <TClass::Init>: no dictionary for class EventHeader is available
+Warning in <TClass::Init>: no dictionary for class Track is available
 My option are thefirstoption
 My name is T
 tree number: 0 T1
diff --git a/roottest/root/tree/selector/run.C b/roottest/root/tree/selector/run.C
index 8a1fb142f43e2..1bd4716791137 100644
--- a/roottest/root/tree/selector/run.C
+++ b/roottest/root/tree/selector/run.C
@@ -1,12 +1,13 @@
+void run()
 {
 // Avoid loading the library
 gInterpreter->UnloadLibraryMap("sel_C");
-new TFile("Event1.root");
-tree1 = T1;
-new TFile("Event2.root");
-tree2 = T2;
-new TFile("Event3.root");
-tree3 = T3;
+TFile::Open("Event1.root");
+auto tree1 = (TTree*) gFile->Get("T1");
+TFile::Open("Event2.root");
+auto tree2 = (TTree*) gFile->Get("T2");
+TFile::Open("Event3.root");
+auto tree3 = (TTree*) gFile->Get("T3");
 tree1->Process("sel.C","T1");
 tree2->Process("sel.C","T2");
 tree3->Process("sel.C","T3");
@@ -15,5 +16,4 @@ TSelector *sel = TSelector::GetSelector("sel.C");
 tree1->Process(sel,"T1");
 tree2->Process(sel,"T2");
 tree3->Process(sel,"T3");
-return 0;
 }
diff --git a/roottest/root/tree/selector/runSelectorCintTest.C b/roottest/root/tree/selector/runSelectorCintTest.C
index b7f58a00c194d..eaf6efe0541b8 100644
--- a/roottest/root/tree/selector/runSelectorCintTest.C
+++ b/roottest/root/tree/selector/runSelectorCintTest.C
@@ -43,7 +43,7 @@
       tree->Process(&csel);
 # endif
 
-   auto c = new TChain("T1");
+   c = new TChain("T1");
    c->Add("Event1.root");
 # ifdef ClingWorkAroundMissingDynamicScope
    c->Process(csel);
diff --git a/roottest/root/tree/selector/selector.ref b/roottest/root/tree/selector/selector.ref
index 15751155ed9a7..5dd6cfbc0c4d3 100644
--- a/roottest/root/tree/selector/selector.ref
+++ b/roottest/root/tree/selector/selector.ref
@@ -1,8 +1,8 @@
 
 Processing run.C...
-Warning in <TClass::TClass>: no dictionary for class Event is available
-Warning in <TClass::TClass>: no dictionary for class EventHeader is available
-Warning in <TClass::TClass>: no dictionary for class Track is available
+Warning in <TClass::Init>: no dictionary for class Event is available
+Warning in <TClass::Init>: no dictionary for class EventHeader is available
+Warning in <TClass::Init>: no dictionary for class Track is available
 My option are T1
 My name is T1
 My option are T2
diff --git a/roottest/root/tree/selectorreader/.rootrc b/roottest/root/tree/selectorreader/.rootrc
deleted file mode 100644
index 6ebe75fd4ec5a..0000000000000
--- a/roottest/root/tree/selectorreader/.rootrc
+++ /dev/null
@@ -1 +0,0 @@
-Rint.History:            .root_hist
diff --git a/roottest/root/tree/selectorreader/CMakeLists.txt b/roottest/root/tree/selectorreader/CMakeLists.txt
index e022f2120292b..d88e6a66f051a 100644
--- a/roottest/root/tree/selectorreader/CMakeLists.txt
+++ b/roottest/root/tree/selectorreader/CMakeLists.txt
@@ -1,14 +1,38 @@
-#execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/generated_selectors)
-#execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_SOURCE_DIR}/trees ${CMAKE_CURRENT_BINARY_DIR}/trees)
+ROOTTEST_ADD_TEST(mkdir
+                  COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/generated_selectors
+                  FIXTURES_SETUP root-tree-selectorreader-mkdir-fixture)
 
-#ROOTTEST_COMPILE_MACRO(SampleClasses.h)
-#ROOTTEST_ADD_TEST(Classes
-#                  COPY_TO_BUILDDIR  SampleClasses.h
-#                  MACRO runClasses.C
-#                  OUTREF Classes.ref
-#                  DEPENDS ${COMPILE_MACRO_TEST})
+ROOTTEST_COMPILE_MACRO(SampleClasses.h
+                       FIXTURES_SETUP root-tree-selectorreader-SampleClasses-fixture)
+
+ROOTTEST_ADD_TEST(Classes
+                  MACRO runClasses.C
+                  MACROARG "\"${CMAKE_CURRENT_SOURCE_DIR}\""
+                  OUTREF Classes.ref
+                  FIXTURES_REQUIRED root-tree-selectorreader-mkdir-fixture root-tree-selectorreader-SampleClasses-fixture)
+
+ROOTTEST_ADD_TEST(CollectionClasses
+                  MACRO runCollectionClasses.C
+                  MACROARG "\"${CMAKE_CURRENT_SOURCE_DIR}\""
+                  OUTREF CollectionClasses.ref
+                  FIXTURES_REQUIRED root-tree-selectorreader-mkdir-fixture root-tree-selectorreader-SampleClasses-fixture)
+
+ROOTTEST_ADD_TEST(Collections
+                  MACRO runCollections.C
+                  MACROARG "\"${CMAKE_CURRENT_SOURCE_DIR}\""
+                  OUTREF Collections.ref
+                  FIXTURES_REQUIRED root-tree-selectorreader-mkdir-fixture root-tree-selectorreader-SampleClasses-fixture)
+
+ROOTTEST_ADD_TEST(Options
+                  MACRO runOptions.C
+                  MACROARG "\"${CMAKE_CURRENT_SOURCE_DIR}\""
+                  OUTREF Options.ref
+                  FIXTURES_REQUIRED root-tree-selectorreader-mkdir-fixture root-tree-selectorreader-SampleClasses-fixture)
+
+ROOTTEST_ADD_TEST(Simple
+                  MACRO runSimple.C
+                  MACROARG "\"${CMAKE_CURRENT_SOURCE_DIR}\""
+                  OUTREF Simple.ref
+                  FIXTURES_REQUIRED root-tree-selectorreader-mkdir-fixture)
 
-# It relies very heavily that these tests are run in the source directory
-# so using the old method....
 
-ROOTTEST_ADD_OLDTEST()
diff --git a/roottest/root/tree/selectorreader/Makefile b/roottest/root/tree/selectorreader/Makefile
deleted file mode 100644
index 4272358b2ccf7..0000000000000
--- a/roottest/root/tree/selectorreader/Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-# This is a template for all makefiles.
-
-#Set the list of files to be deleted by clean (Targets can also be specified).:
-CLEAN_TARGETS += $(ALL_LIBRARIES) *.log generated_selectors
-
-# Set the list of target to make while testing.  By default, mytest is the
-# only target added.  If the name of the target is changed in the rules then
-# the name should be changed accordingly in this list.
-
-TEST_TARGETS += Classes CollectionClasses Collections Options Simple mytest
-
-# Search for Rules.mk in roottest/scripts
-# Algorithm:  Find the current working directory and remove everything after
-#  '*roottest/'.  Append the path for Rules.mk from within roottest, which
-#  should be 'scripts/Rules.mk'.  The roottest path is saved in the
-#  ROOTTEST_HOME variable for use by the SUBDIRECTORIES variable and is
-#  exported to eliminate the overhead of findding the path again during
-#  recursive calls of gmake.
-# Since all makefiles should be under roottest or one of its
-#  subdirectories and all recursions of gmake are called by
-#    'cd [DIR]; gmake ...'
-#  this algorithm should not fail in finding /roottest/ in the
-#  current working directory.
-# Issues:  This algorithm will fail if a makefile is called from outside the
-#  roottest folder, as in executing 'gmake -f ~/roottest/Makefile' from
-#  the home directory.
-
-ifeq ($(strip $(ROOTTEST_HOME)),)
-   export ROOTTEST_HOME := $(shell git rev-parse --show-toplevel)/roottest/
-   ifeq ($(strip $(ROOTTEST_HOME)),)
-      export ROOTTEST_HOME := $(shell expr $(CURDIR) : '\(.*/roottest/\)')
-   endif
-   ifeq ($(strip $(ROOTTEST_HOME)),)
-      $(error The head of roottest was not found.  Set ROOTTEST_HOME)
-   endif
-endif
-
-include $(ROOTTEST_HOME)/scripts/Rules.mk
-
-
-# The name of this target should be changed according to the test being run.  Any name changes
-#  should also be reflected in the TEST_TARGETS variable above.
-
-mytest:
-	$(CMDECHO) echo mytest > /dev/null
-
-        
-# Outputs a message if the FAIL variable is null
-
-testWithFailure:
-ifeq ($(FAIL),)
-	$(WarnFailTest)
-endif
-
-
-# Remember that sometest.log can be made automatically from
-#  from runsometest.C
-# This target attempts to create a log file (which should be the output of running the test), and
-#  compares its output with a prebuilt reference file.  The reference file should be copied from
-#  the log files produced during what is considered a successful run of the test.  The testWithDiff
-#  files should be renamed according to the test being run.
-# By default the TestDiff variable is set to compare the .log and .ref files
-# To run a diff and ignore whitespacing use $(TestDiffW)
-
-GENERATEDDIR := generated_selectors
-
-$(GENERATEDDIR):
-	$(CMDECHO)mkdir -p $(GENERATEDDIR)
-
-.PHONY : directories
-
-DIRECTORIES = $(GENERATEDDIR)
-
-directories: $(GENERATEDDIR)
-
-Classes: Classes.log
-	$(TestDiff)
-
-CollectionClasses: CollectionClasses.log
-	$(TestDiff)
-
-Collections: Collections.log
-	$(TestDiff)
-
-Options: Options.log
-	$(TestDiff)
-
-Simple: Simple.log
-	$(TestDiff)
-
-Classes.log: SampleClasses_h.$(DllSuf)
-CollectionClasses.log: SampleClasses_h.$(DllSuf)
-Collections.log: SampleClasses_h.$(DllSuf)
-Options.log: SampleClasses_h.$(DllSuf)
-#Simple.log: SampleClasses_h.$(DllSuf)
-
-SampleClasses_h.$(DllSuf): directories SampleClasses.h
-
diff --git a/roottest/root/tree/selectorreader/SampleClass.ref b/roottest/root/tree/selectorreader/SampleClass.ref
deleted file mode 100644
index 246a7352151b7..0000000000000
--- a/roottest/root/tree/selectorreader/SampleClass.ref
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Info in <TUnixSystem::ACLiC>: creating shared library /build/bellenot/rootdev/roottest/root/tree/selectorreader/SampleClasses_h.so
diff --git a/roottest/root/tree/selectorreader/runClasses.C b/roottest/root/tree/selectorreader/runClasses.C
index 0ccbceff81fcb..912dc429736fc 100644
--- a/roottest/root/tree/selectorreader/runClasses.C
+++ b/roottest/root/tree/selectorreader/runClasses.C
@@ -112,9 +112,7 @@ void generateAll() {
 //   'test_selectors/NameOfTree.C'), which has been already filled with code accessing
 //   the data. (Regarding the header file, it needs no modification, so the newly
 //   generated one is used.)
-void runClasses() {
-   const char *dirSaved = gSystem->pwd(); // Save working directory
-
+void runClasses(const std::string &srcdir = ".") {
    // Loop through test trees
    std::vector<std::string> trees = {"TreeClass0",
                                      "TreeClass2",
@@ -130,13 +128,12 @@ void runClasses() {
    {
       fprintf(stderr, "Testing tree %s\n", treeName.c_str());
 
-      TFile f(("./trees/" + treeName + ".root").c_str()); // Load file
+      TFile f((srcdir + "/trees/" + treeName + ".root").c_str()); // Load file
       TTree *t = (TTree*)f.Get(treeName.c_str());         // Load tree
       gSystem->cd("./generated_selectors");               // Go to gen. folder
       t->MakeSelector();                                  // Generate selector
       gSystem->cd("..");                                  // Go back
-      t->Process(("./test_selectors/" + treeName + ".C").c_str()); // Run (pre-filled) selector
+      t->Process((srcdir + "/test_selectors/" + treeName + ".C").c_str()); // Run (pre-filled) selector
    }
-   gSystem->cd(dirSaved); // Restore working directory
 }
 
diff --git a/roottest/root/tree/selectorreader/runCollectionClasses.C b/roottest/root/tree/selectorreader/runCollectionClasses.C
index e50e7cfbf05e3..6587a96b42fa6 100644
--- a/roottest/root/tree/selectorreader/runCollectionClasses.C
+++ b/roottest/root/tree/selectorreader/runCollectionClasses.C
@@ -212,9 +212,8 @@ void generateAll() {
 //   'test_selectors/NameOfTree.C'), which has been already filled with code accessing
 //   the data. (Regarding the header file, it needs no modification, so the newly
 //   generated one is used.)
-void runCollectionClasses() {
-   const char *dirSaved = gSystem->pwd(); // Save working directory
-
+void runCollectionClasses(const std::string &srcdir = ".")
+{
    // Loop through test trees
    std::vector<std::string> trees = {"TreeVectorClass0",
                                      "TreeVectorClass2",
@@ -229,13 +228,12 @@ void runCollectionClasses() {
    {
       fprintf(stderr, "Testing tree %s\n", treeName.c_str());
 
-      TFile f(("./trees/" + treeName + ".root").c_str()); // Load file
-      TTree *t = (TTree*)f.Get(treeName.c_str());         // Load tree
+      TFile f((srcdir + "/trees/" + treeName + ".root").c_str()); // Load file
+      TTree *t = (TTree*) f.Get(treeName.c_str());         // Load tree
       gSystem->cd("./generated_selectors");               // Go to gen. folder
       t->MakeSelector();                                  // Generate selector
       gSystem->cd("..");                                  // Go back
-      t->Process(("./test_selectors/" + treeName + ".C").c_str()); // Run (pre-filled) selector
+      t->Process((srcdir + "/test_selectors/" + treeName + ".C").c_str()); // Run (pre-filled) selector
    }
-   gSystem->cd(dirSaved); // Restore working directory
 }
 
diff --git a/roottest/root/tree/selectorreader/runCollections.C b/roottest/root/tree/selectorreader/runCollections.C
index 6123f9152d156..bbe96c09a727c 100644
--- a/roottest/root/tree/selectorreader/runCollections.C
+++ b/roottest/root/tree/selectorreader/runCollections.C
@@ -156,9 +156,8 @@ void generateAll() {
 //   'test_selectors/NameOfTree.C'), which has been already filled with code accessing
 //   the data. (Regarding the header file, it needs no modification, so the newly
 //   generated one is used.)
-void runCollections() {
-   const char *dirSaved = gSystem->pwd(); // Save working directory
-
+void runCollections(const std::string &srcdir = ".")
+{
    // Loop through test trees
    std::vector<std::string> trees = {"TreeArray",
                                      "TreeVector",
@@ -171,13 +170,12 @@ void runCollections() {
    {
       fprintf(stderr, "Testing tree %s\n", treeName.c_str());
 
-      TFile f(("./trees/" + treeName + ".root").c_str()); // Load file
+      TFile f((srcdir + "/trees/" + treeName + ".root").c_str()); // Load file
       TTree *t = (TTree*)f.Get(treeName.c_str());         // Load tree
       gSystem->cd("./generated_selectors");               // Go to gen. folder
       t->MakeSelector();                                  // Generate selector
       gSystem->cd("..");                                  // Go back
-      t->Process(("./test_selectors/" + treeName + ".C").c_str()); // Run (pre-filled) selector
+      t->Process((srcdir + "/test_selectors/" + treeName + ".C").c_str()); // Run (pre-filled) selector
    }
-   gSystem->cd(dirSaved); // Restore working directory
 }
 
diff --git a/roottest/root/tree/selectorreader/runOptions.C b/roottest/root/tree/selectorreader/runOptions.C
index 63b9084fb6f19..8854cab1372b2 100644
--- a/roottest/root/tree/selectorreader/runOptions.C
+++ b/roottest/root/tree/selectorreader/runOptions.C
@@ -13,28 +13,26 @@ R__LOAD_LIBRARY(SampleClasses_h)
 //   'test_selectors/NameOfSelector.C'), which has been already filled with code accessing
 //   the data. (Regarding the header file, it needs no modification, so the newly
 //   generated one is used.)
-void runOptions() {
-   const char *dirSaved = gSystem->pwd(); // Save working directory
-
+void runOptions(const std::string &srcdir = ".")
+{
    // Loop through test trees
    std::string treeName = "TreeClassNested2";
    // List of options with their display names
    std::vector<std::string> options = {""      , "@"      , "fC" , "@fC"  , "@ClassB_branch;fC.fEv;@fC;@fC.fPx;noSuchBranch"};
    std::vector<std::string> names   = {"_empty", "_alltop", "_fC", "_atfC", "_complex"};
-   
+
    for (Int_t i = 0; i < options.size(); ++i)
    {
       fprintf(stderr, "Testing option \"%s\"\n", options[i].c_str());
-      
+
       std::string selectorName = treeName + names[i];
 
-      TFile f(("./trees/" + treeName + ".root").c_str()); // Load file
+      TFile f((srcdir + "/trees/" + treeName + ".root").c_str()); // Load file
       TTree *t = (TTree*)f.Get(treeName.c_str());         // Load tree
       gSystem->cd("./generated_selectors");               // Go to gen. folder
       t->MakeSelector(selectorName.c_str(), options[i].c_str());    // Generate selector
       gSystem->cd("..");                                  // Go back
-      t->Process(("./test_selectors/" + selectorName + ".C").c_str()); // Run (pre-filled) selector
+      t->Process((srcdir + "/test_selectors/" + selectorName + ".C").c_str()); // Run (pre-filled) selector
    }
-   gSystem->cd(dirSaved); // Restore working directory
 }
 
diff --git a/roottest/root/tree/selectorreader/runSimple.C b/roottest/root/tree/selectorreader/runSimple.C
index 5aca299a262e7..b17c0a5baf115 100644
--- a/roottest/root/tree/selectorreader/runSimple.C
+++ b/roottest/root/tree/selectorreader/runSimple.C
@@ -73,22 +73,20 @@ void generateAll() {
 //   'test_selectors/NameOfTree.C'), which has been already filled with code accessing
 //   the data. (Regarding the header file, it needs no modification, so the newly
 //   generated one is used.)
-void runSimple() {
-   const char *dirSaved = gSystem->pwd(); // Save working directory
-
+void runSimple(const std::string &srcdir = ".")
+{
    // Loop through test trees
    std::vector<std::string> trees = {"Tree", "TreeStruct"};
    for (std::string const &treeName : trees)
    {
       fprintf(stderr, "Testing tree %s\n", treeName.c_str());
 
-      TFile f(("./trees/" + treeName + ".root").c_str()); // Load file
+      TFile f((srcdir + "/trees/" + treeName + ".root").c_str()); // Load file
       TTree *t = (TTree*)f.Get(treeName.c_str());         // Load tree
       gSystem->cd("./generated_selectors");               // Go to gen. folder
       t->MakeSelector();                                  // Generate selector
       gSystem->cd("..");                                  // Go back
-      t->Process(("./test_selectors/" + treeName + ".C").c_str()); // Run (pre-filled) selector
+      t->Process((srcdir + "/test_selectors/" + treeName + ".C").c_str()); // Run (pre-filled) selector
    }
-   gSystem->cd(dirSaved); // Restore working directory
 }
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/Tree.C b/roottest/root/tree/selectorreader/test_selectors/Tree.C
index f4df7daa1eab4..8dfd6ad2b5f01 100644
--- a/roottest/root/tree/selectorreader/test_selectors/Tree.C
+++ b/roottest/root/tree/selectorreader/test_selectors/Tree.C
@@ -1,6 +1,6 @@
 #define Tree_cxx
 
-#include "../generated_selectors/Tree.h"
+#include "generated_selectors/Tree.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeArray.C b/roottest/root/tree/selectorreader/test_selectors/TreeArray.C
index b54eb9790e677..e66bed42cbc17 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeArray.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeArray.C
@@ -1,6 +1,6 @@
 #define TreeArray_cxx
 
-#include "../generated_selectors/TreeArray.h"
+#include "generated_selectors/TreeArray.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeClass0.C b/roottest/root/tree/selectorreader/test_selectors/TreeClass0.C
index 86cbcc853b380..8544ed84f9a2d 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeClass0.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeClass0.C
@@ -1,6 +1,6 @@
 #define TreeClass0_cxx
 
-#include "../generated_selectors/TreeClass0.h"
+#include "generated_selectors/TreeClass0.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeClass2.C b/roottest/root/tree/selectorreader/test_selectors/TreeClass2.C
index 1e99dabfc8b98..6d4df48210ceb 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeClass2.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeClass2.C
@@ -1,6 +1,6 @@
 #define TreeClass2_cxx
 
-#include "../generated_selectors/TreeClass2.h"
+#include "generated_selectors/TreeClass2.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeClassNested0.C b/roottest/root/tree/selectorreader/test_selectors/TreeClassNested0.C
index 576b7d7dbad99..12bc7b8726ca6 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeClassNested0.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeClassNested0.C
@@ -1,6 +1,6 @@
 #define TreeClassNested0_cxx
 
-#include "../generated_selectors/TreeClassNested0.h"
+#include "generated_selectors/TreeClassNested0.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeClassNested1.C b/roottest/root/tree/selectorreader/test_selectors/TreeClassNested1.C
index 717580817ba58..151465073ec1b 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeClassNested1.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeClassNested1.C
@@ -1,6 +1,6 @@
 #define TreeClassNested1_cxx
 
-#include "../generated_selectors/TreeClassNested1.h"
+#include "generated_selectors/TreeClassNested1.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2.C b/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2.C
index aa620c735fd21..e875e0fc7a414 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2.C
@@ -1,6 +1,6 @@
 #define TreeClassNested2_cxx
 
-#include "../generated_selectors/TreeClassNested2.h"
+#include "generated_selectors/TreeClassNested2.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2_alltop.C b/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2_alltop.C
index 0492af3a7a1cc..21bfdc6d3a41d 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2_alltop.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2_alltop.C
@@ -1,6 +1,6 @@
 #define TreeClassNested2_alltop_cxx
 
-#include "../generated_selectors/TreeClassNested2_alltop.h"
+#include "generated_selectors/TreeClassNested2_alltop.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2_atfC.C b/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2_atfC.C
index 6465c946c36fc..d8f83f35a3fe0 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2_atfC.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2_atfC.C
@@ -1,6 +1,6 @@
 #define TreeClassNested2_atfC_cxx
 
-#include "../generated_selectors/TreeClassNested2_atfC.h"
+#include "generated_selectors/TreeClassNested2_atfC.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2_complex.C b/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2_complex.C
index 091703890413f..1598b3a0d25ab 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2_complex.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2_complex.C
@@ -1,6 +1,6 @@
 #define TreeClassNested2_complex_cxx
 
-#include "../generated_selectors/TreeClassNested2_complex.h"
+#include "generated_selectors/TreeClassNested2_complex.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2_empty.C b/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2_empty.C
index 97c9843f6173d..ac38179d591b1 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2_empty.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2_empty.C
@@ -1,6 +1,6 @@
 #define TreeClassNested2_empty_cxx
 
-#include "../generated_selectors/TreeClassNested2_empty.h"
+#include "generated_selectors/TreeClassNested2_empty.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2_fC.C b/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2_fC.C
index 318cb7b23f82b..60b9c6ec34439 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2_fC.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeClassNested2_fC.C
@@ -1,6 +1,6 @@
 #define TreeClassNested2_fC_cxx
 
-#include "../generated_selectors/TreeClassNested2_fC.h"
+#include "generated_selectors/TreeClassNested2_fC.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeClassWithArray.C b/roottest/root/tree/selectorreader/test_selectors/TreeClassWithArray.C
index c86e25f6eeebc..9e85732a2a890 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeClassWithArray.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeClassWithArray.C
@@ -1,6 +1,6 @@
 #define TreeClassWithArray_cxx
 
-#include "../generated_selectors/TreeClassWithArray.h"
+#include "generated_selectors/TreeClassWithArray.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeClassWithClones.C b/roottest/root/tree/selectorreader/test_selectors/TreeClassWithClones.C
index 8b12b2b8c449f..be92cbe481b3f 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeClassWithClones.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeClassWithClones.C
@@ -1,6 +1,6 @@
 #define TreeClassWithClones_cxx
 
-#include "../generated_selectors/TreeClassWithClones.h"
+#include "generated_selectors/TreeClassWithClones.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeClassWithVector.C b/roottest/root/tree/selectorreader/test_selectors/TreeClassWithVector.C
index beb6271c5d1d2..68268b4d2442c 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeClassWithVector.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeClassWithVector.C
@@ -1,6 +1,6 @@
 #define TreeClassWithVector_cxx
 
-#include "../generated_selectors/TreeClassWithVector.h"
+#include "generated_selectors/TreeClassWithVector.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeContainers.C b/roottest/root/tree/selectorreader/test_selectors/TreeContainers.C
index e58b95bf6dcbf..40988df13f167 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeContainers.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeContainers.C
@@ -1,6 +1,6 @@
 #define TreeContainers_cxx
 
-#include "../generated_selectors/TreeContainers.h"
+#include "generated_selectors/TreeContainers.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeDuplicateName.C b/roottest/root/tree/selectorreader/test_selectors/TreeDuplicateName.C
index da41fb0681751..774dd807d43ed 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeDuplicateName.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeDuplicateName.C
@@ -1,6 +1,6 @@
 #define TreeDuplicateName_cxx
 
-#include "../generated_selectors/TreeDuplicateName.h"
+#include "generated_selectors/TreeDuplicateName.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeEventTreeSimple0.C b/roottest/root/tree/selectorreader/test_selectors/TreeEventTreeSimple0.C
index 8a51aa047d0e9..741f80d0d119b 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeEventTreeSimple0.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeEventTreeSimple0.C
@@ -1,6 +1,6 @@
 #define TreeEventTreeSimple0_cxx
 
-#include "../generated_selectors/TreeEventTreeSimple0.h"
+#include "generated_selectors/TreeEventTreeSimple0.h"
 #include <TH2.h>
 #include <TStyle.h>
 
@@ -19,7 +19,7 @@ Bool_t TreeEventTreeSimple0::Process(Long64_t entry)
    fReader.SetEntry(entry);
 
    fprintf(stderr, "EventSize: %d\n", Event_branch->fEventSize);
-   
+
    fprintf(stderr, "Px:");
    for(Int_t i = 0; i < Event_branch->fParticles.size(); ++i)
       fprintf(stderr, " %.1lf", Event_branch->fParticles[i].fPosX);
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeEventTreeSimple1.C b/roottest/root/tree/selectorreader/test_selectors/TreeEventTreeSimple1.C
index 86a69f24b8903..d1a1b78167f27 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeEventTreeSimple1.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeEventTreeSimple1.C
@@ -1,6 +1,6 @@
 #define TreeEventTreeSimple1_cxx
 
-#include "../generated_selectors/TreeEventTreeSimple1.h"
+#include "generated_selectors/TreeEventTreeSimple1.h"
 #include <TH2.h>
 #include <TStyle.h>
 
@@ -19,7 +19,7 @@ Bool_t TreeEventTreeSimple1::Process(Long64_t entry)
    fReader.SetEntry(entry);
 
    fprintf(stderr, "EventSize: %d\n", *fEventSize);
-   
+
    fprintf(stderr, "Px:");
    for(Int_t i = 0; i < fParticles.GetSize(); ++i)
       fprintf(stderr, " %.1lf", fParticles[i].fPosX);
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeEventTreeSimple2.C b/roottest/root/tree/selectorreader/test_selectors/TreeEventTreeSimple2.C
index 910c899636a72..8b7febb4de9d9 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeEventTreeSimple2.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeEventTreeSimple2.C
@@ -1,6 +1,6 @@
 #define TreeEventTreeSimple2_cxx
 
-#include "../generated_selectors/TreeEventTreeSimple2.h"
+#include "generated_selectors/TreeEventTreeSimple2.h"
 #include <TH2.h>
 #include <TStyle.h>
 
@@ -19,7 +19,7 @@ Bool_t TreeEventTreeSimple2::Process(Long64_t entry)
    fReader.SetEntry(entry);
 
    fprintf(stderr, "EventSize: %d\n", *fEventSize);
-   
+
    fprintf(stderr, "Px:");
    for(Int_t i = 0; i < fParticles_fPosX.GetSize(); ++i)
       fprintf(stderr, " %.1lf", fParticles_fPosX[i]);
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeNestedArray.C b/roottest/root/tree/selectorreader/test_selectors/TreeNestedArray.C
index ea23e2ccb0f52..0f9499dfbc87c 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeNestedArray.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeNestedArray.C
@@ -1,6 +1,6 @@
 #define TreeNestedArray_cxx
 
-#include "../generated_selectors/TreeNestedArray.h"
+#include "generated_selectors/TreeNestedArray.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeNestedClones.C b/roottest/root/tree/selectorreader/test_selectors/TreeNestedClones.C
index e3ddf7c91bbfb..320fb901b3c5f 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeNestedClones.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeNestedClones.C
@@ -1,6 +1,6 @@
 #define TreeNestedClones_cxx
 
-#include "../generated_selectors/TreeNestedClones.h"
+#include "generated_selectors/TreeNestedClones.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeNestedVector.C b/roottest/root/tree/selectorreader/test_selectors/TreeNestedVector.C
index fad0280ff5dc8..0ec7069feea14 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeNestedVector.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeNestedVector.C
@@ -1,6 +1,6 @@
 #define TreeNestedVector_cxx
 
-#include "../generated_selectors/TreeNestedVector.h"
+#include "generated_selectors/TreeNestedVector.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeStruct.C b/roottest/root/tree/selectorreader/test_selectors/TreeStruct.C
index b167c35831735..7dc65c1e26837 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeStruct.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeStruct.C
@@ -1,6 +1,6 @@
 #define TreeStruct_cxx
 
-#include "../generated_selectors/TreeStruct.h"
+#include "generated_selectors/TreeStruct.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeTClonesArray0.C b/roottest/root/tree/selectorreader/test_selectors/TreeTClonesArray0.C
index 18919d5eb121a..7330a41b7afcd 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeTClonesArray0.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeTClonesArray0.C
@@ -1,6 +1,6 @@
 #define TreeTClonesArray0_cxx
 
-#include "../generated_selectors/TreeTClonesArray0.h"
+#include "generated_selectors/TreeTClonesArray0.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeTClonesArray2.C b/roottest/root/tree/selectorreader/test_selectors/TreeTClonesArray2.C
index cb3601c5f14d3..b7e497aa073db 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeTClonesArray2.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeTClonesArray2.C
@@ -1,6 +1,6 @@
 #define TreeTClonesArray2_cxx
 
-#include "../generated_selectors/TreeTClonesArray2.h"
+#include "generated_selectors/TreeTClonesArray2.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeTObjArray.C b/roottest/root/tree/selectorreader/test_selectors/TreeTObjArray.C
index 83af2f8155156..78d4807593245 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeTObjArray.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeTObjArray.C
@@ -1,6 +1,6 @@
 #define TreeTObjArray_cxx
 
-#include "../generated_selectors/TreeTObjArray.h"
+#include "generated_selectors/TreeTObjArray.h"
 #include <TH2.h>
 #include <TStyle.h>
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeVector.C b/roottest/root/tree/selectorreader/test_selectors/TreeVector.C
index 580e281a367f4..c7d0576449a35 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeVector.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeVector.C
@@ -1,6 +1,6 @@
 #define TreeVector_cxx
 
-#include "../generated_selectors/TreeVector.h"
+#include "generated_selectors/TreeVector.h"
 #include <TH2.h>
 #include <TStyle.h>
 
@@ -20,7 +20,7 @@ Bool_t TreeVector::Process(Long64_t entry)
 
    for (Int_t i = 0; i < vpx.GetSize(); ++i) fprintf(stderr, "%.1f ", vpx[i]);
    fprintf(stderr, "\n");
-   
+
    for (Int_t i = 0; i < vb->size(); ++i) fprintf(stderr, "%d ", static_cast<int>((*vb)[i]));
    fprintf(stderr, "\n");
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeVectorClass0.C b/roottest/root/tree/selectorreader/test_selectors/TreeVectorClass0.C
index 35c681291b754..527fd71cba6c4 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeVectorClass0.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeVectorClass0.C
@@ -1,6 +1,6 @@
 #define TreeVectorClass0_cxx
 
-#include "../generated_selectors/TreeVectorClass0.h"
+#include "generated_selectors/TreeVectorClass0.h"
 #include <TH2.h>
 #include <TStyle.h>
 
@@ -30,7 +30,7 @@ Bool_t TreeVectorClass0::Process(Long64_t entry)
    fprintf(stderr, "PosZ: ");
    for (Int_t i = 0; i < vp.GetSize(); ++i) fprintf(stderr, " %.1lf", vp[i].fPosZ);
    fprintf(stderr, "\n");
-   
+
    return kTRUE;
 }
 
diff --git a/roottest/root/tree/selectorreader/test_selectors/TreeVectorClass2.C b/roottest/root/tree/selectorreader/test_selectors/TreeVectorClass2.C
index 260cd3954dcbd..55f5008ae9a58 100644
--- a/roottest/root/tree/selectorreader/test_selectors/TreeVectorClass2.C
+++ b/roottest/root/tree/selectorreader/test_selectors/TreeVectorClass2.C
@@ -1,6 +1,6 @@
 #define TreeVectorClass2_cxx
 
-#include "../generated_selectors/TreeVectorClass2.h"
+#include "generated_selectors/TreeVectorClass2.h"
 #include <TH2.h>
 #include <TStyle.h>