diff --git a/roottest/root/io/rootcint/.rootrc b/roottest/root/io/rootcint/.rootrc
deleted file mode 100644
index 6ebe75fd4ec5a..0000000000000
--- a/roottest/root/io/rootcint/.rootrc
+++ /dev/null
@@ -1 +0,0 @@
-Rint.History:            .root_hist
diff --git a/roottest/root/io/rootcint/CMakeLists.txt b/roottest/root/io/rootcint/CMakeLists.txt
index 374514855ca45..1c6520e0229c4 100644
--- a/roottest/root/io/rootcint/CMakeLists.txt
+++ b/roottest/root/io/rootcint/CMakeLists.txt
@@ -1,7 +1,48 @@
-#-------------------------------------------------------------------------------
-#
-# 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(LABELS longtest)
+ROOTTEST_ADD_TESTDIRS()
+
+ROOTTEST_GENERATE_DICTIONARY(testDict
+                             test.h
+                             LINKDEF testLinkDef.h
+                             NO_ROOTMAP NO_CXXMODULE)
+
+ROOTTEST_COMPILE_MACRO(cltest.C
+                       FIXTURES_SETUP root-io-rootcint-cltest-fixture)
+
+ROOTTEST_ADD_TEST(cltest
+                  MACRO cltest.C+
+                  OUTREF cltest.ref
+                  FIXTURES_REQUIRED root-io-rootcint-cltest-fixture)
+
+ROOTTEST_ADD_TEST(TemplateExpr
+                  MACRO execTemplateExpr.C
+                  OUTREF execTemplateExpr.ref)
+
+ROOTTEST_COMPILE_MACRO(virtualbase.h
+                       FIXTURES_SETUP root-io-rootcint-virtualbase-fixture)
+
+ROOTTEST_ADD_TEST(nestedtemplate
+                  MACRO runnestedtemplate.C
+                  OUTREF nestedtemplate.ref)
+
+ROOTTEST_COMPILE_MACRO(templateKeyword.C
+                       FIXTURES_SETUP root-io-rootcint-templateKeyword-fixture)
+
+ROOTTEST_ADD_TEST(templateKeyword
+                  MACRO runtemplateKeyword.C
+                  OUTREF templateKeyword.ref
+                  FIXTURES_REQUIRED root-io-rootcint-templateKeyword-fixture)
+
+ROOTTEST_ADD_TEST(virtualbase
+                  MACRO runvirtualbase.C
+                  OUTREF virtualbase.ref
+                  FIXTURES_REQUIRED root-io-rootcint-virtualbase-fixture)
+
+ROOTTEST_GENERATE_DICTIONARY(weirdpair
+                             weirdpair.h
+                             LINKDEF weirdpair_LinkDef.h
+                             NO_ROOTMAP NO_CXXMODULE)
+
+ROOTTEST_GENERATE_DICTIONARY(foo
+                             foo.hh
+                             LINKDEF foo_linkdef.h
+                             NO_ROOTMAP NO_CXXMODULE)
diff --git a/roottest/root/io/rootcint/Makefile b/roottest/root/io/rootcint/Makefile
deleted file mode 100644
index 6cbf741c714b1..0000000000000
--- a/roottest/root/io/rootcint/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-# This is a template for all makefile.
-
-#Set the list of files to be delete by clean:
-CLEAN_TARGETS += $(ALL_LIBRARIES) *.log  MidadCint* cltest.root
-
-#Set the list of target to make while testing
-TEST_TARGETS += sigbug virtualbase templateKeyword mytest rootcintIntTest constMemberTest cltest nestedtemplate weirdpairTest
-
-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
-
-mytest:
-	$(CMDECHO) echo mytest > /dev/null
-
-testWithFailure:
-ifeq ($(FAIL),)
-	$(WarnFailTest)
-endif
-
-testDict.cxx: test.h testLinkDef.h
-	$(CMDECHO) rootcint -f testDict.cxx test.h testLinkDef.h
-
-rootcintIntTest: testDict.$(ObjSuf)
-
-constMemberDict.cxx: constMember.h linkdef.h $(ROOTCINT)
-	$(CMDECHO) rootcint -f constMemberDict.cxx constMember.h linkdef.h 
-
-constMemberTest: constMemberDict.$(ObjSuf)
-
-templateKeyword.log: templateKeyword_C.$(DllSuf)
-
-templateKeyword: templateKeyword.log
-	$(TestDiff)
-
-virtualbase.log: virtualbase_h.$(DllSuf)
-
-virtualbase: virtualbase.log
-	$(TestDiff)
-
-sigbug.log:
-	$(CMDECHO) (echo start && rootcint -f MidadCint.cc -p -Isigbug -DUNIX -DLINUX -D__UNIX__ -D__LINUX__ -DDATAREP_LITTLE_IEEE -DDATAREP_LITTLE_ENDIAN -DDEFECT_NO_IOSTREAM_NAMESPACES -DDEFECT_NO_JZEXT -DDEFECT_NO_INTHEX -DDEFECT_NO_INTHOLLERITH -DDEFECT_NO_READONLY -DDEFECT_NO_DIRECT_FIXED -DDEFECT_NO_STRUCTURE -DUSE_ROOT -I${ROOTSYS}/include Mint.h LinkDef.h) | grep -v _cint.cxx > sigbug.log 2>&1
-
-
-sigbug: sigbug.log
-	$(TestDiff)
-
-out.cxx: foo.hh foo_linkdef.h
-	$(CMDECHO) rootcint -f out.cxx foo.hh foo_linkdef.h
-
-weirdpair_dict.cxx: weirdpair.h weirdpair_LinkDef.h
-	$(CMDECHO) rootcling -f weirdpair_dict.cxx  weirdpair.h weirdpair_LinkDef.h > weirdpair_dict.rootcling.log 2>&1
-
-weirdpairTest: weirdpair_dict.$(ObjSuf)
-
-namespacetemp: out.$(ObjSuf)
-
-cltest_C.$(DllSuf): cltestClass.h cltestClass.cxx cltestLinkdef.h
-
-cltest.log: cltest_C.$(DllSuf)
-	$(CMDECHO) $(CALLROOTEXE) -b -q -l cltest.C+ > cltest.log 2>&1 
-
-ifeq ($(FAIL)$(PLATFORM),win32)
-cltest: 
-	$(WarnFailTest)
-else
-cltest: cltest.log
-	$(TestDiff)
-endif
-
-ifeq ($(FAIL),)
-nestedtemplate:
-	$(WarnFailTest)
-else
-nestedtemplate: nestedtemplate.clog
-	$(TestDiff)
-endif
diff --git a/roottest/root/io/rootcint/doubleconst/.rootrc b/roottest/root/io/rootcint/doubleconst/.rootrc
deleted file mode 100644
index 6ebe75fd4ec5a..0000000000000
--- a/roottest/root/io/rootcint/doubleconst/.rootrc
+++ /dev/null
@@ -1 +0,0 @@
-Rint.History:            .root_hist
diff --git a/roottest/root/io/rootcint/doubleconst/AlgClusterSRList.h b/roottest/root/io/rootcint/doubleconst/AlgClusterSRList.h
index 1bdb58338a737..520706ed2b12d 100644
--- a/roottest/root/io/rootcint/doubleconst/AlgClusterSRList.h
+++ b/roottest/root/io/rootcint/doubleconst/AlgClusterSRList.h
@@ -18,7 +18,7 @@ class AlgClusterSRList : public TObject
   std::map<CandStripHandle *,  AltCandStpProbHandle *> fLikelihoods2;
 
 
-  ClassDef(AlgClusterSRList,1)                // ClusterSRList Algorithm Class
+  ClassDefOverride(AlgClusterSRList,1)                // ClusterSRList Algorithm Class
 };
 
 #endif                                                 // ALGCLUSTERSRLIST_H
diff --git a/roottest/root/io/rootcint/doubleconst/CMakeLists.txt b/roottest/root/io/rootcint/doubleconst/CMakeLists.txt
new file mode 100644
index 0000000000000..74eecffb61cd3
--- /dev/null
+++ b/roottest/root/io/rootcint/doubleconst/CMakeLists.txt
@@ -0,0 +1,6 @@
+ROOTTEST_GENERATE_DICTIONARY(CandCluster
+                             AlgClusterSRList.h CandStripHandle.h
+                             SOURCES AlgClusterSRList.cxx CandStripHandle.cxx
+                             LINKDEF LinkDef.h
+                             COMPILE_OPTIONS -DUNIX -DLINUX -D__UNIX__ -D__LINUX__ -DDATAREP_LITTLE_IEEE -DDATAREP_LITTLE_ENDIAN -DDEFECT_NO_IOSTREAM_NAMESPACES -DDEFECT_NO_JZEXT -DDEFECT_NO_INTHEX -DDEFECT_NO_INTHOLLERITH -DDEFECT_NO_READONLY -DDEFECT_NO_DIRECT_FIXED -DDEFECT_NO_STRUCTURE  -DUSE_ROOT
+                             NO_ROOTMAP NO_CXXMODULE)
diff --git a/roottest/root/io/rootcint/doubleconst/CandStripHandle.h b/roottest/root/io/rootcint/doubleconst/CandStripHandle.h
index 986c5b8e5b3b2..42e7826f23b8d 100644
--- a/roottest/root/io/rootcint/doubleconst/CandStripHandle.h
+++ b/roottest/root/io/rootcint/doubleconst/CandStripHandle.h
@@ -10,7 +10,7 @@ class CandStripHandle : public TObject
   CandStripHandle();
   virtual ~CandStripHandle();
 
-ClassDef(CandStripHandle,1)           // User access handle to CandStrip
+  ClassDefOverride(CandStripHandle,1)           // User access handle to CandStrip
 };
 
 #endif                                              // CANDSTRIPHANDLE_H
diff --git a/roottest/root/io/rootcint/doubleconst/Makefile b/roottest/root/io/rootcint/doubleconst/Makefile
deleted file mode 100644
index f95f2151af521..0000000000000
--- a/roottest/root/io/rootcint/doubleconst/Makefile
+++ /dev/null
@@ -1,70 +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 CandClusterSRCint.*
-
-# 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 += DoubleConstTest
-
-# 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)
-
-testWithDiff: testWithDiff.log testWithDiff.ref
-	$(TestDiff)
-
-DoubleConstTest: CandClusterSRCint.$(ObjSuf)
-
-CandClusterSRCint.cc: AlgClusterSRList.h CandStripHandle.h LinkDef.h
-	$(CMDECHO)rootcint -f CandClusterSRCint.cc -I. -DUNIX -DLINUX -D__UNIX__ -D__LINUX__ -DDATAREP_LITTLE_IEEE -DDATAREP_LITTLE_ENDIAN -DDEFECT_NO_IOSTREAM_NAMESPACES -DDEFECT_NO_JZEXT -DDEFECT_NO_INTHEX -DDEFECT_NO_INTHOLLERITH -DDEFECT_NO_READONLY -DDEFECT_NO_DIRECT_FIXED -DDEFECT_NO_STRUCTURE  -DUSE_ROOT -I{ROOTSYS}/include  AlgClusterSRList.h CandStripHandle.h LinkDef.h
diff --git a/roottest/root/io/rootcint/foo.hh b/roottest/root/io/rootcint/foo.hh
index d97a4ad3415fa..cf6c15c3d3d7d 100644
--- a/roottest/root/io/rootcint/foo.hh
+++ b/roottest/root/io/rootcint/foo.hh
@@ -1,5 +1,6 @@
-#include "TObject.h"
+#pragma once
 
+#include "TObject.h"
 
 namespace ns {
 
diff --git a/roottest/root/io/rootcint/nestedtemplate.ref b/roottest/root/io/rootcint/nestedtemplate.ref
new file mode 100644
index 0000000000000..84f688eb62d93
--- /dev/null
+++ b/roottest/root/io/rootcint/nestedtemplate.ref
@@ -0,0 +1,2 @@
+
+Processing runnestedtemplate.C...
diff --git a/roottest/root/io/rootcint/rootlogon.C b/roottest/root/io/rootcint/rootlogon.C
deleted file mode 100644
index 82bf53c485d3b..0000000000000
--- a/roottest/root/io/rootcint/rootlogon.C
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-#ifdef __APPLE__
-gSystem->Load("libRIO");
-#endif
-}
diff --git a/roottest/root/io/rootcint/runnestedtemplate.C b/roottest/root/io/rootcint/runnestedtemplate.C
index 30f5b3c367cfe..da0b9a992ab52 100644
--- a/roottest/root/io/rootcint/runnestedtemplate.C
+++ b/roottest/root/io/rootcint/runnestedtemplate.C
@@ -1,49 +1,54 @@
 #include "TNamed.h"
 
-template< class T1 > 
-class A { 
-   // ... 
-private: 
-   template< class T2 > 
-   class B  { 
-      T2 fValue; 
-   }; 
-   
-   template< class T2 > 
-   class C : public TNamed { 
-      T2 fValue; 
+template< class T1 >
+class A {
+   // ...
+private:
+   template< class T2 >
+   class B  {
+      T2 fValue;
+   };
+
+   template< class T2 >
+   class C : public TNamed {
+      T2 fValue;
       ClassDef(C,1);
-   }; 
-   
-   A<T1>::B< T1 > fMember3; 
-   A::B< T1 > fMember2; 
+   };
+
+   A<T1>::B< T1 > fMember3;
+   A::B< T1 > fMember2;
    B< T1 > fMember1;
    C<T1> fCMember1;
 
 };
 
-template< class T1 > 
-class TA : public TObject { 
-   // ... 
-private: 
-   template< class T2 > 
-   class B  { 
-      T2 fValue; 
-   }; 
-   
-   template< class T2 > 
-   class C : public TNamed { 
-      T2 fValue; 
+template< class T1 >
+class TA : public TObject {
+   // ...
+private:
+   template< class T2 >
+   class B  {
+      T2 fValue;
+   };
+
+   template< class T2 >
+   class C : public TNamed {
+      T2 fValue;
       ClassDef(C,1);
-   }; 
-   
-   TA<T1>::B< T1 > fMember3; 
-   TA::B< T1 > fMember2; 
+   };
+
+   TA<T1>::B< T1 > fMember3;
+   TA::B< T1 > fMember2;
    B< T1 > fMember1;
    C<T1> fCMember1;
-   
+
    ClassDef(TA,1);
 };
 
-A<short> a;
-TA<short> ta;
+void runnestedtemplate()
+{
+   A<short> a;
+   TA<short> ta;
+}
+
+
diff --git a/roottest/root/io/rootcint/runsigbug.C b/roottest/root/io/rootcint/runsigbug.C
deleted file mode 100644
index b8565a89f01b2..0000000000000
--- a/roottest/root/io/rootcint/runsigbug.C
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-// Fill out the code of the actual test
-}
diff --git a/roottest/root/io/rootcint/sigbug.ref b/roottest/root/io/rootcint/sigbug.ref
deleted file mode 100644
index d44e18fb93b71..0000000000000
--- a/roottest/root/io/rootcint/sigbug.ref
+++ /dev/null
@@ -1 +0,0 @@
-start
diff --git a/roottest/root/io/rootcint/sigbug/.rootrc b/roottest/root/io/rootcint/sigbug/.rootrc
deleted file mode 100644
index 6ebe75fd4ec5a..0000000000000
--- a/roottest/root/io/rootcint/sigbug/.rootrc
+++ /dev/null
@@ -1 +0,0 @@
-Rint.History:            .root_hist
diff --git a/roottest/root/io/rootcint/sigbug/CMakeLists.txt b/roottest/root/io/rootcint/sigbug/CMakeLists.txt
new file mode 100644
index 0000000000000..c06217725de45
--- /dev/null
+++ b/roottest/root/io/rootcint/sigbug/CMakeLists.txt
@@ -0,0 +1,21 @@
+set(CMAKE_ROOTTEST_DICT ON)
+set(CMAKE_ROOTTEST_NOROOTMAP ON)
+
+set(dictname Midad)
+
+ROOTTEST_TARGETNAME_FROM_FILE(GENERATE_DICTIONARY_TEST ${dictname})
+
+set(GENERATE_DICTIONARY_TEST ${GENERATE_DICTIONARY_TEST}-build)
+
+ROOT_GENERATE_DICTIONARY(${dictname}
+                         ${CMAKE_CURRENT_SOURCE_DIR}/Mint.h
+                         NO_CXXMODULE
+                         MODULE ${dictname}
+                         LINKDEF ${CMAKE_CURRENT_SOURCE_DIR}/LinkDef.h
+                         OPTIONS -DUNIX -DLINUX -D__UNIX__ -D__LINUX__ -DDATAREP_LITTLE_IEEE -DDATAREP_LITTLE_ENDIAN -DDEFECT_NO_IOSTREAM_NAMESPACES -DDEFECT_NO_JZEXT -DDEFECT_NO_INTHEX -DDEFECT_NO_INTHOLLERITH -DDEFECT_NO_READONLY -DDEFECT_NO_DIRECT_FIXED -DDEFECT_NO_STRUCTURE -DUSE_ROOT)
+
+add_test(NAME ${GENERATE_DICTIONARY_TEST}
+           COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}
+                                    ${build_config}
+                                    --target ${dictname}${fast}
+                                    -- ${always-make})
diff --git a/roottest/root/io/rootcint/sigbug/sigc++/.rootrc b/roottest/root/io/rootcint/sigbug/sigc++/.rootrc
deleted file mode 100644
index 6ebe75fd4ec5a..0000000000000
--- a/roottest/root/io/rootcint/sigbug/sigc++/.rootrc
+++ /dev/null
@@ -1 +0,0 @@
-Rint.History:            .root_hist
diff --git a/roottest/root/io/rootcint/sigbug/sigc++/macros/.rootrc b/roottest/root/io/rootcint/sigbug/sigc++/macros/.rootrc
deleted file mode 100644
index 6ebe75fd4ec5a..0000000000000
--- a/roottest/root/io/rootcint/sigbug/sigc++/macros/.rootrc
+++ /dev/null
@@ -1 +0,0 @@
-Rint.History:            .root_hist
diff --git a/roottest/root/io/rootcint/stl/.rootrc b/roottest/root/io/rootcint/stl/.rootrc
deleted file mode 100644
index 6ebe75fd4ec5a..0000000000000
--- a/roottest/root/io/rootcint/stl/.rootrc
+++ /dev/null
@@ -1 +0,0 @@
-Rint.History:            .root_hist
diff --git a/roottest/root/io/rootcint/stl/CMakeLists.txt b/roottest/root/io/rootcint/stl/CMakeLists.txt
new file mode 100644
index 0000000000000..4dd43c6660944
--- /dev/null
+++ b/roottest/root/io/rootcint/stl/CMakeLists.txt
@@ -0,0 +1,13 @@
+foreach(dict Safr test0 test1 test2)
+  ROOTTEST_GENERATE_DICTIONARY(${dict}
+                               ${dict}.h
+                               LINKDEF ${dict}LinkDef.h
+                               NO_ROOTMAP NO_CXXMODULE)
+endforeach()
+
+foreach(dict map1 map2)
+  ROOTTEST_GENERATE_DICTIONARY(${dict}
+                               ${dict}.C
+                               LINKDEF emptyLinkdef.h
+                               NO_ROOTMAP NO_CXXMODULE)
+endforeach()
diff --git a/roottest/root/io/rootcint/stl/Makefile b/roottest/root/io/rootcint/stl/Makefile
deleted file mode 100644
index 083b770ae24e4..0000000000000
--- a/roottest/root/io/rootcint/stl/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# This is a template for all makefile.
-
-#Set the list of files to be delete by clean:
-CLEAN_TARGETS += $(ALL_LIBRARIES) *_dict*
-
-#Set the list of target to make while testing
-TEST_TARGETS += rootcintStlTest
-
-# adjust the location of Rules.mk as needed.
-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
-
-
-mytest:
-	$(CMDECHO) echo mytest > /dev/null
-
-testWithFailure:
-ifeq ($(FAIL),)
-	$(WarnFailTest)
-endif
-
-RCTEST_H = $(wildcard test?.h) Safr.h
-RCTEST_DICT = $(subst .h,_dict.cxx,$(RCTEST_H))
-RCTEST_DICTO = $(subst .cxx,.$(ObjSuf),$(RCTEST_DICT))
-
-$(RCTEST_DICT) : %_dict.cxx : %.h %LinkDef.h
-	$(CMDECHO) rootcint -f $@ $^
-
-MAPTEST_C = map1.C map2.C
-MAPTEST_DICT =  $(subst .C,_dict.cxx,$(MAPTEST_C))
-MAPTEST_DICTO = $(subst .cxx,.$(ObjSuf),$(MAPTEST_DICT))
-
-$(MAPTEST_DICT) : %_dict.cxx : %.C emptyLinkdef.h
-	$(CMDECHO) rootcint -f $@ $^
-
-rootcintStlTest : $(RCTEST_DICTO) $(MAPTEST_DICTO)
-
diff --git a/roottest/root/io/rootcint/stl/Safr.h b/roottest/root/io/rootcint/stl/Safr.h
index 888b5d40cc2b1..c8510c56024a2 100644
--- a/roottest/root/io/rootcint/stl/Safr.h
+++ b/roottest/root/io/rootcint/stl/Safr.h
@@ -12,5 +12,5 @@ class Safr : public TMatrixF {
  public:
   Safr() : TMatrixF(5,5) {}
 
-  ClassDef(Safr, 1)
+  ClassDefOverride(Safr, 1)
 };
diff --git a/roottest/root/io/rootcint/stl/test0.h b/roottest/root/io/rootcint/stl/test0.h
index 6c72651dbb90a..3e01ed69f33c7 100644
--- a/roottest/root/io/rootcint/stl/test0.h
+++ b/roottest/root/io/rootcint/stl/test0.h
@@ -9,7 +9,7 @@ class TFBaseCol : public TNamed
 {
 protected:
    std::set    <ULong64_t> fNull;   // set of (row,bins) which are NULL values
-   ClassDef(TFBaseCol,1) // Abstract base column of TFTable
+   ClassDefOverride(TFBaseCol,1) // Abstract base column of TFTable
 };
 
 #endif
diff --git a/roottest/root/io/rootcint/stl/test1.h b/roottest/root/io/rootcint/stl/test1.h
index b2f2159f309a5..a63bd7a7fd2e1 100644
--- a/roottest/root/io/rootcint/stl/test1.h
+++ b/roottest/root/io/rootcint/stl/test1.h
@@ -9,6 +9,7 @@ class TFVirtualIO
 {
 public:
  virtual  void GetColNames(std::map<TString, TNamed> &columns) = 0;
+ virtual ~TFVirtualIO() {}
  ClassDef(TFVirtualIO,0) // interface definition to files storing TFIOElements
 };
 
diff --git a/roottest/root/io/rootcint/stl/test2.h b/roottest/root/io/rootcint/stl/test2.h
index f8bdba9dc6511..3e78ca8c1b157 100644
--- a/roottest/root/io/rootcint/stl/test2.h
+++ b/roottest/root/io/rootcint/stl/test2.h
@@ -11,7 +11,7 @@ template <class T>
 {
 protected:
    std::vector <T>      fData;       // all Data of this column
-   ClassDef(TFColumn, 1) // A column of TFTable
+   ClassDefOverride(TFColumn, 1) // A column of TFTable
 };
 
 #endif