diff --git a/roofit/histfactory/test/testHistFactory.cxx b/roofit/histfactory/test/testHistFactory.cxx
index f66f1ce0a0b39..ec0aee3fc4dcf 100644
--- a/roofit/histfactory/test/testHistFactory.cxx
+++ b/roofit/histfactory/test/testHistFactory.cxx
@@ -89,10 +89,6 @@ TEST(HistFactory, Read_ROOT6_16_Model)
 
    std::string filename = "./ref_6.16_example_UsingC_channel1_meas_model.root";
    std::unique_ptr<TFile> file(TFile::Open(filename.c_str()));
-   if (!file || !file->IsOpen()) {
-      filename = TROOT::GetRootSys() + "/roofit/histfactory/test/" + filename;
-      file.reset(TFile::Open(filename.c_str()));
-   }
 
    ASSERT_TRUE(file && file->IsOpen());
    RooWorkspace *ws;
@@ -118,10 +114,6 @@ TEST(HistFactory, Read_ROOT6_16_Combined_Model)
 
    std::string filename = "./ref_6.16_example_UsingC_combined_meas_model.root";
    std::unique_ptr<TFile> file(TFile::Open(filename.c_str()));
-   if (!file || !file->IsOpen()) {
-      filename = TROOT::GetRootSys() + "/roofit/histfactory/test/" + filename;
-      file.reset(TFile::Open(filename.c_str()));
-   }
 
    ASSERT_TRUE(file && file->IsOpen());
    RooWorkspace *ws;
@@ -143,7 +135,12 @@ TEST(HistFactory, Read_ROOT6_16_Combined_Model)
 
 /// What kind of model is set up. Use this to instantiate
 /// a test suite.
-enum class MakeModelMode { OverallSyst, HistoSyst, StatSyst, ShapeSyst };
+enum class MakeModelMode {
+   OverallSyst,
+   HistoSyst,
+   StatSyst,
+   ShapeSyst
+};
 
 using HFTestParam = std::tuple<MakeModelMode, bool, RooFit::EvalBackend>;
 
@@ -695,7 +692,7 @@ INSTANTIATE_TEST_SUITE_P(
    HistFactory, HFFixture,
    testing::Combine(testing::Values(MakeModelMode::OverallSyst, MakeModelMode::HistoSyst, MakeModelMode::StatSyst,
                                     MakeModelMode::ShapeSyst),
-                    testing::Values(false, true),                    // non-uniform bins or not
+                    testing::Values(false, true),                 // non-uniform bins or not
                     testing::Values(RooFit::EvalBackend::Cpu())), // dummy because no NLL is created
    [](testing::TestParamInfo<HFFixture::ParamType> const &paramInfo) { return getName(paramInfo.param, true); });
 
diff --git a/test/bench.cxx b/test/bench.cxx
index 1a0019beda24a..cb3efee566448 100644
--- a/test/bench.cxx
+++ b/test/bench.cxx
@@ -112,9 +112,6 @@ template <class TGen> TBenchData runTest(const char *name, int nevents, int nhit
 
 int main(int argc, char **argv)
 {
-   std::string inclRootSys = ("-I" + TROOT::GetRootSys() + "/test").Data();
-   TROOT::AddExtraInterpreterArgs({inclRootSys});
-
    bool writereferences = false;
    bool memberwise = false;
    bool shortrun = false;
diff --git a/test/stress.cxx b/test/stress.cxx
index 8741a54de4b43..47cd0884eecc3 100644
--- a/test/stress.cxx
+++ b/test/stress.cxx
@@ -123,9 +123,6 @@ void cleanup();
 
 int main(int argc, char **argv)
 {
-   std::string inclRootSys = ("-I" + TROOT::GetRootSys() + "/test").Data();
-   TROOT::AddExtraInterpreterArgs({inclRootSys});
-
    gROOT->SetBatch();
    TApplication theApp("App", &argc, argv);
    gBenchmark = new TBenchmark();
diff --git a/test/stressIOPlugins.cxx b/test/stressIOPlugins.cxx
index 8aa64734a0ffb..a8562a2e59017 100644
--- a/test/stressIOPlugins.cxx
+++ b/test/stressIOPlugins.cxx
@@ -89,9 +89,6 @@ void cleanup();
 
 int main(int argc, char **argv)
 {
-   std::string inclRootSys = ("-I" + TROOT::GetRootSys() + "/test").Data();
-   TROOT::AddExtraInterpreterArgs({inclRootSys});
-
    gROOT->SetBatch();
    TApplication theApp("App", &argc, argv);
    const char *proto = 0;
diff --git a/test/stressInterpreter.cxx b/test/stressInterpreter.cxx
index 704b270c0638a..fa3faae23891f 100644
--- a/test/stressInterpreter.cxx
+++ b/test/stressInterpreter.cxx
@@ -224,8 +224,7 @@ bool InterpreterStress::stressSTLDict() {
       int res = 3;
       TInterpreter::EErrorCode interpError = TInterpreter::kNoError;
       TString cmd
-         = TString::Format("#include <vector>\n"
-                           "class MyClass;\n"
+         = TString::Format("class MyClass;\n"
                            "typedef MyClass* Klass%d_t;\n"
                            "std::vector<Klass%d_t> v%d;\n"
                            "void stressInterpreter_tmp%d() {\n"
diff --git a/test/stressMathCore.cxx b/test/stressMathCore.cxx
index ccc417e5bff50..077e8cad5afe8 100644
--- a/test/stressMathCore.cxx
+++ b/test/stressMathCore.cxx
@@ -1563,9 +1563,6 @@ int stressMathCore(double nscale = 1) {
 
 
 int main(int argc,const char *argv[]) {
-   std::string inclRootSys = ("-I" + TROOT::GetRootSys() + "/test").Data();
-   TROOT::AddExtraInterpreterArgs({inclRootSys});
-
    double nscale = 1;
    if (argc > 1) {
       nscale = atof(argv[1]);