diff --git a/roottest/cling/offset/.rootrc b/roottest/cling/offset/.rootrc
deleted file mode 100644
index 6ebe75fd4ec5a..0000000000000
--- a/roottest/cling/offset/.rootrc
+++ /dev/null
@@ -1 +0,0 @@
-Rint.History:            .root_hist
diff --git a/roottest/cling/offset/CMakeLists.txt b/roottest/cling/offset/CMakeLists.txt
index 66ea4cebe3987..5db9cafcda2b4 100644
--- a/roottest/cling/offset/CMakeLists.txt
+++ b/roottest/cling/offset/CMakeLists.txt
@@ -2,13 +2,18 @@ ROOTTEST_ADD_TEST(interpreted
                   MACRO runvbase.C
                   OUTREF vbase-i.out.ref
                   ERRREF vbase-i.err.ref
-                  LABELS roottest regression cling)
+                  LABELS roottest regression cling
+                  PRECMD ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_BINARY_DIR}/runvbase_C${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_CURRENT_BINARY_DIR}/runvbase_C_ACLiC_dict_rdict.pcm
+                  FIXTURES_SETUP cling-offset-runvbase-cling-fixture)
+
+ROOTTEST_COMPILE_MACRO(runvbase.C
+                       FIXTURES_REQUIRED cling-offset-runvbase-cling-fixture
+                       FIXTURES_SETUP cling-offset-runvbase-compile-fixture)
 
-ROOTTEST_COMPILE_MACRO(runvbase.C)
 ROOTTEST_ADD_TEST(compiled
                   MACRO runvbase.C+
                   OUTREF vbase-c.out.ref
                   ERRREF vbase-c.err.ref
                   LABELS roottest regression cling
-                  DEPENDS ${COMPILE_MACRO_TEST})
+                  FIXTURES_REQUIRED cling-offset-runvbase-compile-fixture)
 
diff --git a/roottest/cling/offset/rootlogon.C b/roottest/cling/offset/rootlogon.C
deleted file mode 100644
index 9fa08e99d86d6..0000000000000
--- a/roottest/cling/offset/rootlogon.C
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-   TString cmd( gSystem->GetMakeSharedLib() );
-   cmd.ReplaceAll("-Werror","");
-   gSystem->SetMakeSharedLib(cmd);
-}
diff --git a/roottest/cling/offset/vbase-c.ref b/roottest/cling/offset/vbase-c.ref
deleted file mode 100644
index 68d241647ce99..0000000000000
--- a/roottest/cling/offset/vbase-c.ref
+++ /dev/null
@@ -1,43 +0,0 @@
-
-Processing runvbase.C+...
-derived Basement -> base Top: Compiler and interpreter say the same value.
-derived Basement -> base Top: Compiler and interpreter say the same value.
-Top does not derive from Basement:
-derived Top -> base Basement: Compiler says something, interpreter says -1.
-The object is a base ptr object:
-derived Basement -> base Top: Compiler and TClass agree or offset fail - this is as good as it gets.
-derived Basement -> base Fill: Compiler and interpreter say the same value.
-derived Basement -> base Mid1: Compiler and interpreter say the same value.
-derived Basement -> base Bottom: Compiler and interpreter say the same value.
-derived Basement -> base Basement: Compiler and interpreter say the same value.
-derived Bottom -> base Top: Compiler and interpreter say the same value.
-derived Bottom -> base Mid1: Compiler and interpreter say the same value.
-derived Bottom -> base Mid2: Compiler and interpreter say the same value.
-derived Bottom -> base Bottom: Compiler and interpreter say the same value.
-derived Mid1 -> base Top: Compiler and interpreter say the same value.
-derived Mid1 -> base Mid1: Compiler and interpreter say the same value.
-The derived class does not derive from base, thus we expect different results from compiler and cling.
-derived Mid1 -> base Mid2: Compiler says something, interpreter says -1.
-derived Mid2 -> base Top: Compiler and interpreter say the same value.
-derived Mid2 -> base Mid2: Compiler and interpreter say the same value.
-Multiple paths case:
-Error in <TClingBaseClassInfo::Offset>: There are multiple paths from derived class Basement to base class Mid2.
-derived Basement -> base Mid2: TClass says -1
-derived Basement -> base Top: Compiler and interpreter say the same value.
-derived Basement -> base Top: Compiler and interpreter say the same value.
-Top does not derive from Basement:
-derived Top -> base Basement: Compiler says something, interpreter says -1.
-derived Basement -> base Fill: Compiler and interpreter say the same value.
-derived Basement -> base Mid1: Compiler and interpreter say the same value.
-derived Basement -> base Bottom: Compiler and interpreter say the same value.
-derived Basement -> base Basement: Compiler and interpreter say the same value.
-derived Bottom -> base Top: Compiler and interpreter say the same value.
-derived Bottom -> base Mid1: Compiler and interpreter say the same value.
-derived Bottom -> base Mid2: Compiler and interpreter say the same value.
-derived Bottom -> base Bottom: Compiler and interpreter say the same value.
-derived Mid1 -> base Top: Compiler and interpreter say the same value.
-derived Mid1 -> base Mid1: Compiler and interpreter say the same value.
-The derived class does not derive from base, thus we expect different results from compiler and cling.
-derived Mid1 -> base Mid2: Compiler says something, interpreter says -1.
-derived Mid2 -> base Top: Compiler and interpreter say the same value.
-derived Mid2 -> base Mid2: Compiler and interpreter say the same value.
diff --git a/roottest/cling/offset/vbase-i.ref b/roottest/cling/offset/vbase-i.ref
deleted file mode 100644
index 7c091e3099679..0000000000000
--- a/roottest/cling/offset/vbase-i.ref
+++ /dev/null
@@ -1,43 +0,0 @@
-
-Processing runvbase.C...
-derived Basement -> base Top: Compiler and interpreter say the same value.
-derived Basement -> base Top: Compiler and interpreter say the same value.
-Top does not derive from Basement:
-derived Top -> base Basement: Compiler says something, interpreter says -1.
-The object is a base ptr object:
-derived Basement -> base Top: Compiler and TClass agree or offset fail - this is as good as it gets.
-derived Basement -> base Fill: Compiler and interpreter say the same value.
-derived Basement -> base Mid1: Compiler and interpreter say the same value.
-derived Basement -> base Bottom: Compiler and interpreter say the same value.
-derived Basement -> base Basement: Compiler and interpreter say the same value.
-derived Bottom -> base Top: Compiler and interpreter say the same value.
-derived Bottom -> base Mid1: Compiler and interpreter say the same value.
-derived Bottom -> base Mid2: Compiler and interpreter say the same value.
-derived Bottom -> base Bottom: Compiler and interpreter say the same value.
-derived Mid1 -> base Top: Compiler and interpreter say the same value.
-derived Mid1 -> base Mid1: Compiler and interpreter say the same value.
-The derived class does not derive from base, thus we expect different results from compiler and cling.
-derived Mid1 -> base Mid2: Compiler says something, interpreter says -1.
-derived Mid2 -> base Top: Compiler and interpreter say the same value.
-derived Mid2 -> base Mid2: Compiler and interpreter say the same value.
-Multiple paths case:
-Error in <TClingBaseClassInfo::Offset>: There are multiple paths from derived class Basement to base class Mid2.
-derived Basement -> base Mid2: TClass says -1
-derived Basement -> base Top: Compiler and interpreter say the same value.
-derived Basement -> base Top: Compiler and interpreter say the same value.
-Top does not derive from Basement:
-derived Top -> base Basement: Compiler says something, interpreter says -1.
-derived Basement -> base Fill: Compiler and interpreter say the same value.
-derived Basement -> base Mid1: Compiler and interpreter say the same value.
-derived Basement -> base Bottom: Compiler and interpreter say the same value.
-derived Basement -> base Basement: Compiler and interpreter say the same value.
-derived Bottom -> base Top: Compiler and interpreter say the same value.
-derived Bottom -> base Mid1: Compiler and interpreter say the same value.
-derived Bottom -> base Mid2: Compiler and interpreter say the same value.
-derived Bottom -> base Bottom: Compiler and interpreter say the same value.
-derived Mid1 -> base Top: Compiler and interpreter say the same value.
-derived Mid1 -> base Mid1: Compiler and interpreter say the same value.
-The derived class does not derive from base, thus we expect different results from compiler and cling.
-derived Mid1 -> base Mid2: Compiler says something, interpreter says -1.
-derived Mid2 -> base Top: Compiler and interpreter say the same value.
-derived Mid2 -> base Mid2: Compiler and interpreter say the same value.
diff --git a/roottest/cling/stl/map/.rootrc b/roottest/cling/stl/map/.rootrc
deleted file mode 100644
index 6ebe75fd4ec5a..0000000000000
--- a/roottest/cling/stl/map/.rootrc
+++ /dev/null
@@ -1 +0,0 @@
-Rint.History:            .root_hist
diff --git a/roottest/cling/stl/map/CMakeLists.txt b/roottest/cling/stl/map/CMakeLists.txt
index 131fe48279a67..da246377af7b2 100644
--- a/roottest/cling/stl/map/CMakeLists.txt
+++ b/roottest/cling/stl/map/CMakeLists.txt
@@ -1,19 +1,28 @@
 ROOTTEST_GENERATE_DICTIONARY(dict.C testing.C LINKDEF LinkDef.h)
 
+ROOTTEST_COMPILE_MACRO(MyOpClass.C
+                       FIXTURES_SETUP cling-stl-map-MyOpClass-fixtures)
+
+ROOTTEST_COMPILE_MACRO(MyClass.C
+                       FIXTURES_SETUP cling-stl-map-MyClass-fixtures)
+
+ROOTTEST_COMPILE_MACRO(stringMapLoad.cxx
+                       FIXTURES_SETUP cling-stl-map-stringMapLoad-fixtures)
+
 ROOTTEST_ADD_TEST(badOperator
                   MACRO badOperator.C
                   OUTREF badOperatorTest.ref
-                  DEPENDS MyOpClass.C
+                  FIXTURES_REQUIRED cling-stl-map-MyOpClass-fixtures
                   LABELS roottest regression cling)
 
 ROOTTEST_ADD_TEST(stringMap
                   MACRO stringMap.cxx
                   OUTREF stringMapTest.ref
-                  DEPENDS stringMapLoad.cxx
+                  FIXTURES_REQUIRED cling-stl-map-stringMapLoad-fixtures
                   LABELS roottest regression cling)
 
 ROOTTEST_ADD_TEST(badstringMap
                   MACRO badstringMap.cxx
                   OUTREF badstringMapTest.ref
-                  DEPENDS MyClass.C
+                  FIXTURES_REQUIRED cling-stl-map-stringMapLoad-fixtures cling-stl-map-MyClass-fixtures
                   LABELS roottest regression cling)
diff --git a/roottest/cling/template/.rootrc b/roottest/cling/template/.rootrc
deleted file mode 100644
index 6ebe75fd4ec5a..0000000000000
--- a/roottest/cling/template/.rootrc
+++ /dev/null
@@ -1 +0,0 @@
-Rint.History:            .root_hist
diff --git a/roottest/cling/template/CMakeLists.txt b/roottest/cling/template/CMakeLists.txt
index b09112838c33e..052a286a3c98d 100644
--- a/roottest/cling/template/CMakeLists.txt
+++ b/roottest/cling/template/CMakeLists.txt
@@ -1,14 +1,19 @@
+ROOTTEST_COMPILE_MACRO(longlong.C
+                       FIXTURES_SETUP cling-template-longlong-fixture)
+
 ROOTTEST_ADD_TEST(longlong
                   MACRO runlonglong.C
                   OUTREF longlong.ref
-                  DEPENDS longlong.C
+                  FIXTURES_REQUIRED cling-template-longlong-fixture
                   LABELS roottest regression cling)
 
+ROOTTEST_COMPILE_MACRO(Singleton.h
+                       FIXTURES_SETUP cling-template-Singleton-fixture)
 
 ROOTTEST_ADD_TEST(templateSingleton
                   MACRO runtemplateSingleton.C
                   OUTREF templateSingleton.ref
-                  DEPENDS Singleton.h
+                  FIXTURES_REQUIRED cling-template-Singleton-fixture
                   LABELS roottest regression cling)
 
 if(NOT ROOT_runtime_cxxmodules_FOUND)
@@ -17,31 +22,41 @@ endif()
 ROOTTEST_GENERATE_DICTIONARY(masterDict       master.h       LINKDEF masterLinkDef.h)
 ROOTTEST_GENERATE_DICTIONARY(forwardDict      forward.C      LINKDEF linkdef.h)
 ROOTTEST_GENERATE_DICTIONARY(constructorDict  constructor.hh LINKDEF linkdef.h)
-ROOTTEST_GENERATE_DICTIONARY(typenameTestDict typenameTest.C LINKDEF linkdef.h)
+ROOTTEST_GENERATE_DICTIONARY(typenameTestDict typenameTest.C LINKDEF linkdef.h
+                             FIXTURES_SETUP cling-template-typenameTestDict-fixture)
+
+ROOTTEST_COMPILE_MACRO(usingtemplate.C
+                       FIXTURES_SETUP cling-template-usingtemplate-fixture)
 
 ROOTTEST_ADD_TEST(runusingtemplate
                   MACRO runusingtemplate.C
                   OUTREF usingtemplate.ref
-                  DEPENDS usingtemplate.C
+                  FIXTURES_REQUIRED cling-template-usingtemplate-fixture
                   LABELS roottest regression cling)
 
+ROOTTEST_COMPILE_MACRO(templatefriend.cxx
+                       FIXTURES_SETUP cling-template-templatefriend-fixture)
+
 ROOTTEST_ADD_TEST(runtemplatefriend
                   MACRO runtemplatefriend.C
                   OUTREF templatefriend.ref
-                  DEPENDS templatefriend.cxx typenameTestDict-build
+                  FIXTURES_REQUIRED cling-template-templatefriend-fixture cling-template-typenameTestDict-fixture
                   LABELS roottest regression cling)
 
 ROOTTEST_ADD_TEST(interpreted
                   MACRO smalltest.C
+                  PRECMD ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_BINARY_DIR}/smalltest_C${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_CURRENT_BINARY_DIR}/smalltest_C_ACLiC_dict_rdict.pcm
+                  FIXTURES_SETUP cling-template-smalltest-interpreted-fixture
                   LABELS roottest regression cling)
 
 ROOTTEST_ADD_TEST(compiled
                   MACRO smalltest.C+
+                  FIXTURES_REQUIRED cling-template-smalltest-interpreted-fixture
                   LABELS roottest regression cling)
-                  
+
 ROOTTEST_ADD_TEST(defaultTemplateParam
                   MACRO execdefaultTemplateParam.cxx+
                   OUTREF execdefaultTemplateParam.ref
                   LABELS roottest regression cling)
-                  
+
 ROOTTEST_ADD_TESTDIRS()
diff --git a/roottest/cling/templateMembers/.rootrc b/roottest/cling/templateMembers/.rootrc
deleted file mode 100644
index 6ebe75fd4ec5a..0000000000000
--- a/roottest/cling/templateMembers/.rootrc
+++ /dev/null
@@ -1 +0,0 @@
-Rint.History:            .root_hist
diff --git a/roottest/cling/templateMembers/CMakeLists.txt b/roottest/cling/templateMembers/CMakeLists.txt
index 3068dc6686923..74cf737125cc1 100644
--- a/roottest/cling/templateMembers/CMakeLists.txt
+++ b/roottest/cling/templateMembers/CMakeLists.txt
@@ -1,21 +1,64 @@
+ROOTTEST_COMPILE_MACRO(duplicate.C
+                       FIXTURES_SETUP cling-templateMembers-duplicate-fixture)
+
 ROOTTEST_ADD_TEST(runduplicate
                   MACRO runduplicate.C
                   OUTREF duplicate.ref
-                  DEPENDS duplicate.C
+                  FIXTURES_REQUIRED cling-templateMembers-duplicate-fixture
                   LABELS roottest regression cling)
 
+ROOTTEST_COMPILE_MACRO(operatorEqual.C
+                       FIXTURES_SETUP cling-templateMembers-operatorEqual-fixture)
+
 ROOTTEST_ADD_TEST(runoperatorEqual
                   MACRO runoperatorEqual.C
                   OUTREF_CINTSPECIFIC operatorEqual.ref
                   OUTCNVCMD grep -v FILE
                   OUTCNV runoperatorEqual_convert.sh
-                  DEPENDS operatorEqual.C
+                  FIXTURES_REQUIRED cling-templateMembers-operatorEqual-fixture
                   LABELS roottest regression cling)
 
+ROOTTEST_COMPILE_MACRO(constructor.C
+                       FIXTURES_SETUP cling-templateMembers-constructor-fixture)
+
 ROOTTEST_ADD_TEST(runConstructor
                   MACRO runConstructor.C
                   OUTREF templateConstructorTest.ref
-                  DEPENDS constructor.C
+                  FIXTURES_REQUIRED cling-templateMembers-constructor-fixture
                   LABELS roottest regression cling)
 
 ROOTTEST_GENERATE_DICTIONARY(opdict operator.C LINKDEF linkdef.h)
+
+ROOTTEST_GENERATE_DICTIONARY(libtemplateMembersDict
+                             templateMembersClasses.h
+                             LINKDEF templateMembersLinkdef.h
+                             NO_CXXMODULE
+                             FIXTURES_SETUP cling-templateMembers-libtemplateMembersDict-fixture)
+
+ROOTTEST_COMPILE_MACRO(templateMembers.C
+                       FIXTURES_REQUIRED cling-templateMembers-libtemplateMembersDict-fixture
+                       FIXTURES_SETUP cling-templateMembers-templateMembers-fixture)
+
+ROOTTEST_ADD_TEST(runtemplateMembers-interprter
+                  MACRO runtemplateMembers.C
+                  MACROARG false
+                  OUTCNVCMD grep -v -e "Processing" -e "Mem"
+                  PRECMD ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_BINARY_DIR}/templateMembersCode_C${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_CURRENT_BINARY_DIR}/templateMembersCode_C_ACLiC_dict_rdict.pcm
+                  FIXTURES_REQUIRED cling-templateMembers-templateMembers-fixture
+                                    cling-templateMembers-libtemplateMembersDict-fixture
+                  FIXTURES_SETUP cling-templateMembers-runtemplateMembers-interprter-fixture
+                  LABELS roottest regression cling)
+
+ROOTTEST_COMPILE_MACRO(templateMembersCode.C
+                        FIXTURES_REQUIRED cling-templateMembers-runtemplateMembers-interprter-fixture
+                                          cling-templateMembers-libtemplateMembersDict-fixture
+                        FIXTURES_SETUP cling-templateMembers-templateMembersCode-fixture)
+
+ROOTTEST_ADD_TEST(runtemplateMemberscompiled
+                  MACRO runtemplateMembers.C
+                  MACROARG true
+                  OUTCNVCMD grep -v -e "Processing" -e "Mem"
+                  FIXTURES_REQUIRED cling-templateMembers-templateMembers-fixture
+                                    cling-templateMembers-libtemplateMembersDict-fixture
+                                    cling-templateMembers-templateMembersCode-fixture
+                  LABELS roottest regression cling)
diff --git a/roottest/cling/templateMembers/templateMembersClasses.h b/roottest/cling/templateMembers/templateMembersClasses.h
index 9b1b53e3f5667..720d76ef6c069 100644
--- a/roottest/cling/templateMembers/templateMembersClasses.h
+++ b/roottest/cling/templateMembers/templateMembersClasses.h
@@ -93,7 +93,7 @@ class my_shared_ptr {
       my_shared_ptr<T>& operator=(const my_shared_ptr<U>&) { SHOW; return *this; }
 
   template <class U>
-    my_shared_ptr<T>(const my_shared_ptr<U>&) { SHOW; } //rootcint can't find this
+    my_shared_ptr(const my_shared_ptr<U>&) { SHOW; } //rootcint can't find this
 
 /*   template <class U> */
 /*     my_shared_ptr<T>() { SHOW; } //rootcint can't find this */
diff --git a/roottest/cmake/modules/RoottestMacros.cmake b/roottest/cmake/modules/RoottestMacros.cmake
index a848d0b9ed6d4..16c93bf6c546d 100644
--- a/roottest/cmake/modules/RoottestMacros.cmake
+++ b/roottest/cmake/modules/RoottestMacros.cmake
@@ -218,6 +218,7 @@ macro(ROOTTEST_COMPILE_MACRO filename)
         -e "gROOT->SetMacroPath(\"${CMAKE_CURRENT_SOURCE_DIR}\")"
         -e "gInterpreter->AddIncludePath(\"-I${CMAKE_CURRENT_BINARY_DIR}\")"
         -e "gSystem->AddIncludePath(\"-I${CMAKE_CURRENT_BINARY_DIR}\")"
+        -e "gSystem->SetBuildDir(\"${CMAKE_CURRENT_BINARY_DIR}\", true)"
         ${RootMacroDirDefines})
 
   set(root_compile_macro ${ROOT_root_CMD} ${RootMacroBuildDefines} -q -l -b)
@@ -280,21 +281,6 @@ macro(ROOTTEST_COMPILE_MACRO filename)
       FIXTURES_REQUIRED ${ARG_FIXTURES_REQUIRED})
   endif()
 
-  if(MSVC)
-    string(REPLACE "." "_" dll_name ${filename})
-    add_custom_command(TARGET ${compile_target} POST_BUILD
-       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}.dll
-                                        ${CMAKE_CURRENT_BINARY_DIR}/
-       COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}_ACLiC_dict_rdict.pcm
-                                        ${CMAKE_CURRENT_BINARY_DIR}/
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}.d
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}.def
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}.dll
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}.exp
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}.lib
-       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_CURRENT_SOURCE_DIR}/${dll_name}_ACLiC_dict_rdict.pcm)
-  endif()
-
 endmacro(ROOTTEST_COMPILE_MACRO)
 
 #-------------------------------------------------------------------------------
diff --git a/roottest/root/meta/tclass/.rootrc b/roottest/root/meta/tclass/.rootrc
deleted file mode 100644
index 6ebe75fd4ec5a..0000000000000
--- a/roottest/root/meta/tclass/.rootrc
+++ /dev/null
@@ -1 +0,0 @@
-Rint.History:            .root_hist
diff --git a/roottest/root/meta/tclass/CMakeLists.txt b/roottest/root/meta/tclass/CMakeLists.txt
index 2a04714e9aa0f..1f6e760dd087b 100644
--- a/roottest/root/meta/tclass/CMakeLists.txt
+++ b/roottest/root/meta/tclass/CMakeLists.txt
@@ -3,37 +3,47 @@ ROOTTEST_ADD_TEST(execBrowseNonAccessibleType
                   MACRO execBrowseNonAccessibleType.C)
 
 ROOTTEST_ADD_TEST(RunMyClass
-                  MACRO RunMyClass.C+)
+                  MACRO RunMyClass.C+
+                  FIXTURES_SETUP root-meta-tclass-RunMyClas-fixture)
 
 ROOTTEST_ADD_TEST(runclassref
                   MACRO runclassref.C
                   OUTREF classref.ref
-                  DEPENDS RunMyClass)
+                  FIXTURES_REQUIRED root-meta-tclass-RunMyClas-fixture)
+
+ROOTTEST_COMPILE_MACRO(tempParse.C
+                       FIXTURES_SETUP root-meta-tclass-tempParse-fixture)
 
 ROOTTEST_ADD_TEST(runtempParse
                   MACRO runtempParse.C
                   OUTREF tempParse.ref
-                  DEPENDS tempParse.C)
+                  FIXTURES_REQUIRED root-meta-tclass-tempParse-fixture)
 
 ROOTTEST_ADD_TEST(runpairs
                   COPY_TO_BUILDDIR  pairs_v5.root
                   MACRO runpairs.C+
                   OUTREF pairs.ref)
 
+ROOTTEST_COMPILE_MACRO(classlib.cxx
+                       FIXTURES_SETUP root-meta-tclass-classlib-fixture)
+
 ROOTTEST_ADD_TEST(execInterpClassNew
                   MACRO execInterpClassNew.C
                   OUTREF execInterpClassNew.ref
-                  DEPENDS classlib.cxx)
+                  FIXTURES_REQUIRED root-meta-tclass-classlib-fixture)
 
 ROOTTEST_ADD_TEST(execProperties
                   MACRO execProperties.C
                   OUTREF execProperties.ref)
 
+ROOTTEST_COMPILE_MACRO(libState.cxx
+                       FIXTURES_SETUP root-meta-tclass-libState-fixture)
+
 ROOTTEST_ADD_TEST(execState
-                  COPY_TO_BUILDDIR tc_state.root libState.cxx
+                  COPY_TO_BUILDDIR tc_state.root
                   MACRO execState.C
                   OUTREF execState.ref
-                  DEPENDS libState.cxx)
+                  FIXTURES_REQUIRED root-meta-tclass-libState-fixture)
 
 ROOTTEST_ADD_TEST(execSharedPtr
                   MACRO execSharedPtr.C
@@ -49,31 +59,40 @@ ROOTTEST_ADD_TEST(execTClassRehash
 
 ROOTTEST_ADD_TEST(execTmpltD
                   MACRO execTmpltD.cxx+
-                  OUTREF execTmpltD.ref)
+                  OUTREF execTmpltD.ref
+                  FIXTURES_SETUP root-meta-tclass-execTmpltD-fixture)
 
 ROOTTEST_ADD_TEST(execTmpltD32
                   MACRO execTmpltD32.cxx+
-                  OUTREF execTmpltD32.ref)
+                  OUTREF execTmpltD32.ref
+                  FIXTURES_SETUP root-meta-tclass-execTmpltD32-fixture)
 
-ROOTTEST_COMPILE_MACRO(execReadTmplt.cxx)
+ROOTTEST_COMPILE_MACRO(execReadTmplt.cxx
+                       FIXTURES_SETUP root-meta-tclass-execReadTmplt-fixture)
 
 ROOTTEST_ADD_TEST(execReadTmplt
                   COPY_TO_BUILDDIR tmplt.h
                   MACRO execReadTmplt.cxx+
                   OUTREF execReadTmplt.ref
-                  DEPENDS ${COMPILE_MACRO_TEST} execTmpltD32 execTmpltD)
+                  FIXTURES_REQUIRED root-meta-tclass-execReadTmplt-fixture
+                                    root-meta-tclass-execTmpltD-fixture
+                                    root-meta-tclass-execTmpltD32-fixture)
 
-ROOTTEST_GENERATE_REFLEX_DICTIONARY(SimpleVector simpleVector.h SELECTION simpleVector_selection.xml)
+ROOTTEST_GENERATE_REFLEX_DICTIONARY(SimpleVector simpleVector.h SELECTION simpleVector_selection.xml
+                                    FIXTURES_SETUP root-meta-tclass-SimpleVector-fixture)
 
 ROOTTEST_ADD_TEST(execSimpleVector
                   MACRO execSimpleVector.C
                   OUTREF execSimpleVector.ref
-                  DEPENDS ${GENERATE_REFLEX_TEST})
+                  FIXTURES_REQUIRED root-meta-tclass-SimpleVector-fixture)
+
+ROOTTEST_COMPILE_MACRO(libDuplicate.cxx
+                       FIXTURES_SETUP root-meta-tclass-libDuplicate-fixture)
 
 ROOTTEST_ADD_TEST(execDuplicate
                   MACRO execDuplicate.C
                   OUTREF execDuplicate.ref
-                  DEPENDS libDuplicate.cxx)
+                  FIXTURES_REQUIRED root-meta-tclass-libDuplicate-fixture)
 
 ROOTTEST_ADD_TEST(execReadSimplePair
                   COPY_TO_BUILDDIR simplepair.root
@@ -83,30 +102,31 @@ ROOTTEST_ADD_TEST(execReadSimplePair
 ROOTTEST_GENERATE_DICTIONARY(libdatamemberload
                              datamemberload.h
                              LINKDEF datamemberloadLinkDef.h
-                             NO_ROOTMAP NO_CXXMODULE)
+                             NO_ROOTMAP NO_CXXMODULE
+                             FIXTURES_SETUP root-meta-tclass-libdatamemberload-fixture)
 
 ROOTTEST_ADD_TEST(datamemberload
                   MACRO datamemberload.C
                   COPY_TO_BUILDDIR datamemberload.h
-                  DEPENDS libdatamemberload-build)
+                  FIXTURES_REQUIRED root-meta-tclass-libdatamemberload-fixture)
 
 ROOTTEST_GENERATE_DICTIONARY(libInitOrderDups
                              InitOrderDups.h
                              LINKDEF InitOrderDupsLinkDef.h
                              NO_ROOTMAP NO_CXXMODULE
-                             FIXTURES_SETUP InitOrder)
+                             FIXTURES_SETUP root-meta-tclass-libInitOrderDups-fixture)
 
 ROOTTEST_GENERATE_DICTIONARY(libInitOrder
                              InitOrder.h
                              LINKDEF InitOrderLinkDef.h
                              NO_ROOTMAP NO_CXXMODULE
-                             FIXTURES_SETUP InitOrder)
+                             FIXTURES_SETUP root-meta-tclass-libInitOrder-fixture)
 
 ROOTTEST_ADD_TEST(execInitOrder
                   MACRO execInitOrder.cxx+
                   COPY_TO_BUILDDIR InitOrder.h
                   OUTREF execInitOrder.ref
-                  FIXTURES_REQUIRED InitOrder)
+                  FIXTURES_REQUIRED root-meta-tclass-libInitOrderDups-fixture root-meta-tclass-libInitOrder-fixture)
 
 if(NOT coverage)
   ROOTTEST_ADD_TEST(tclassStl
diff --git a/roottest/root/meta/tclass/regression/.rootrc b/roottest/root/meta/tclass/regression/.rootrc
deleted file mode 100644
index 6ebe75fd4ec5a..0000000000000
--- a/roottest/root/meta/tclass/regression/.rootrc
+++ /dev/null
@@ -1 +0,0 @@
-Rint.History:            .root_hist
diff --git a/roottest/root/meta/tclass/regression/CMakeLists.txt b/roottest/root/meta/tclass/regression/CMakeLists.txt
index cfc11ccc8ba6f..24aa1b7f86050 100644
--- a/roottest/root/meta/tclass/regression/CMakeLists.txt
+++ b/roottest/root/meta/tclass/regression/CMakeLists.txt
@@ -6,7 +6,7 @@ ROOTTEST_ADD_TEST(execNormalizationInf
                   MACRO execNormalizationInf.C
                   OUTREF execNormalizationInf.ref)
 
-if(ROOT_pyroot_FOUND)
+if(pyroot)
     ROOTTEST_ADD_TEST(execNormalizationInfPy
                   MACRO execNormalizationInf.py
                   OUTREF execNormalizationInf.py.ref
@@ -14,19 +14,18 @@ if(ROOT_pyroot_FOUND)
                   CPPYY_BACKEND_LIBRARY=${CMAKE_BINARY_DIR}/lib/libcppyy_backend.so)
 endif()
 
-ROOTTEST_ADD_TEST(execROOT_6038
+ROOTTEST_ADD_TEST(6038
                   MACRO execROOT_6038.C
                   OUTREF execROOT_6038.ref)
 
-ROOTTEST_ADD_TEST(execROOT_6019
+ROOTTEST_ADD_TEST(6019
                   MACRO execROOT_6019.C
                   OUTREF execROOT_6019.ref)
 
-if(MSVC)
-    # needed on Windows to prevent having to run the test twice
-    # the first time being always failing and successful the second time
-    ROOTTEST_COMPILE_MACRO(execROOT_6277.cxx)
-endif()
-ROOTTEST_ADD_TEST(execROOT_6277
+ROOTTEST_COMPILE_MACRO(execROOT_6277.cxx
+                       FIXTURES_SETUP root-meta-tclass-regression-6277-fixture)
+
+ROOTTEST_ADD_TEST(6277
                   MACRO execROOT_6277.cxx+
-                  OUTREF execROOT_6277.ref)
+                  OUTREF execROOT_6277.ref
+                  FIXTURES_REQUIRED root-meta-tclass-regression-6277-fixture)
diff --git a/roottest/root/meta/tclass/regression/Makefile b/roottest/root/meta/tclass/regression/Makefile
deleted file mode 100644
index c3b279b6795e2..0000000000000
--- a/roottest/root/meta/tclass/regression/Makefile
+++ /dev/null
@@ -1,71 +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 *.clog
-
-# 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 += ROOT-6020 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)
-
-testWithDiff: testWithDiff.log testWithDiff.ref
-	$(TestDiff)
-
-
-
-ROOT-6020: ROOT-6020.log
-	$(TestDiff)