diff --git a/cmake/modules/RootMacros.cmake b/cmake/modules/RootMacros.cmake
index e16d6d9434540..5b16083fddc3f 100644
--- a/cmake/modules/RootMacros.cmake
+++ b/cmake/modules/RootMacros.cmake
@@ -2416,6 +2416,7 @@ macro(ROOTTEST_COMPILE_MACRO filename)
   # when using the scripts/build.C macro.
   get_directory_property(DirDefs COMPILE_DEFINITIONS)
 
+  unset(RootMacroDirDefines)
   foreach(d ${DirDefs})
     if(d MATCHES "_WIN32" OR d MATCHES "_XKEYCHECK_H" OR d MATCHES "NOMINMAX")
       continue()
diff --git a/roottest/root/io/newstl/TestHelpers.h b/roottest/root/io/newstl/TestHelpers.h
index be9722cdc86eb..dfc1efac91a3a 100644
--- a/roottest/root/io/newstl/TestHelpers.h
+++ b/roottest/root/io/newstl/TestHelpers.h
@@ -99,7 +99,8 @@ class THelper : public Helper, public TObject {
 public:
    THelper() {};
    explicit THelper(int v,double d) : Helper(v,d) {};
-   virtual const char* CompMsg(const Helper& icopy) const {
+   const char *CompMsg(const Helper &icopy) const override
+   {
       const THelper *copy = dynamic_cast<const THelper*>(&icopy);
       if (copy==0) return "Wrong type (expected THelper)\n";
       return Form("THelper object wrote %d %g and read %d %g\n",val,dval,copy->val,copy->dval);
diff --git a/roottest/root/io/newstl/readNoLib.C b/roottest/root/io/newstl/readNoLib.C
index 1cc4c4e704623..1253fb67d83c9 100644
--- a/roottest/root/io/newstl/readNoLib.C
+++ b/roottest/root/io/newstl/readNoLib.C
@@ -5,7 +5,7 @@ int readNoLib(const char *fname = "vector.root")
    dirname.ReplaceAll("/","-");
 
    TString filename = fname;
-   gSystem->PrependFilePath(dirname, filename);
+   gSystem->PrependPathName(dirname, filename);
 
    auto file0 = TFile::Open(filename);
    if (!file0)