diff --git a/roottest/root/meta/ROOT-7181/.rootrc b/roottest/root/meta/ROOT-7181/.rootrc
deleted file mode 100644
index 84c31bb3db13d..0000000000000
--- a/roottest/root/meta/ROOT-7181/.rootrc
+++ /dev/null
@@ -1,2 +0,0 @@
-Rint.History:            .root_hist
-ACLiC.LinkLibs:     1
diff --git a/roottest/root/meta/ROOT-7181/CMakeLists.txt b/roottest/root/meta/ROOT-7181/CMakeLists.txt
index 182629f9610bb..ccff070702635 100644
--- a/roottest/root/meta/ROOT-7181/CMakeLists.txt
+++ b/roottest/root/meta/ROOT-7181/CMakeLists.txt
@@ -1,8 +1,44 @@
-#-------------------------------------------------------------------------------
-#
-# 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()
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/inc)
+
+ROOTTEST_GENERATE_REFLEX_DICTIONARY(btag
+                                    inc/BTagVertex_v1.h
+                                    SELECTION inc/btag_selection.xml
+                                    FIXTURES_SETUP root-meta-7181-btag-fixture)
+
+ROOTTEST_GENERATE_REFLEX_DICTIONARY(jet
+                                    inc/Jet_v1.h
+                                    SELECTION inc/jet_selection.xml
+                                    FIXTURES_SETUP root-meta-7181-jet-fixture)
+
+ROOTTEST_GENERATE_REFLEX_DICTIONARY(sjet
+                                    inc/SJet_v1.h
+                                    SELECTION inc/sjet_selection.xml
+                                    FIXTURES_SETUP root-meta-7181-sjet-fixture)
+
+macro(ROOT_7181_TEST name use_rmap)
+  if(${use_rmap} STREQUAL "true")
+    set(testname rmap-${name})
+  else()
+    set(testname ${name})
+  endif()
+
+  ROOTTEST_ADD_TEST(${testname}
+                    MACRO runscript.C
+                    MACROARG "\"${name}\",${use_rmap}"
+                    ROOTEXE_OPTS -e "gInterpreter->AddIncludePath(\"-I${CMAKE_CURRENT_SOURCE_DIR}\")"
+                                 -e "gInterpreter->AddIncludePath(\"-I${CMAKE_CURRENT_SOURCE_DIR}/inc\")"
+                    OUTREF ${testname}.ref
+                    FIXTURES_REQUIRED root-meta-7181-btag-fixture
+                                      root-meta-7181-jet-fixture
+                                      root-meta-7181-sjet-fixture)
+endmacro(ROOT_7181_TEST)
+
+ROOT_7181_TEST(case1 false)
+ROOT_7181_TEST(case2 false)
+ROOT_7181_TEST(case3 false)
+ROOT_7181_TEST(case4 false)
+
+ROOT_7181_TEST(case1 true)
+ROOT_7181_TEST(case2 true)
+ROOT_7181_TEST(case3 true)
+ROOT_7181_TEST(case4 true)
diff --git a/roottest/root/meta/ROOT-7181/Makefile b/roottest/root/meta/ROOT-7181/Makefile
deleted file mode 100644
index ba736d68ad8df..0000000000000
--- a/roottest/root/meta/ROOT-7181/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-ALL_CASES = case1 case2 case3 case4
-ALL_ROOTMAP_CASES = $(addprefix rmap-,$(ALL_CASES))
-
-CLEAN_TARGETS += *.log dummy* *pcm *o *rflx.* $(ALL_LIBRARIES) \
-  obj/* lib/* 
-TEST_TARGETS += execLoadLibs $(ALL_CASES) $(ALL_ROOTMAP_CASES)
-
-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
-include $(ROOTTEST_HOME)/scripts/Reflex.mk
-
-obj/jet_dict.cxx: inc/jet_selection.xml inc/Jet_v1.h inc/DataVector.h
-	$(CMDECHO) mkdir -p obj lib && genreflex inc/Jet_v1.h --output obj/jet_dict.cxx -l lib/libjet.so -s inc/jet_selection.xml --rootmap lib/libjet.rootmap -Iinc 
-
-obj/sjet_dict.cxx: inc/sjet_selection.xml inc/SJet_v1.h inc/DataVector.h
-	$(CMDECHO) mkdir -p obj lib && genreflex inc/SJet_v1.h --output obj/sjet_dict.cxx -l lib/libsjet.so -s inc/sjet_selection.xml --rootmap lib/libsjet.rootmap -Iinc 
-
-obj/btag_dict.cxx: inc/btag_selection.xml inc/BTagVertex_v1.h inc/DataVector.h
-	$(CMDECHO) mkdir -p obj lib && genreflex inc/BTagVertex_v1.h --output obj/btag_dict.cxx -l lib/libbtag.so -s inc/btag_selection.xml --rootmap lib/libbtag.rootmap -Iinc 
-
-
-lib/libjet.$(DllSuf): obj/jet_dict.$(ObjSuf)
-	$(BuildFromObj)
-
-lib/libsjet.$(DllSuf): obj/sjet_dict.$(ObjSuf)
-	$(BuildFromObj)
-
-lib/libbtag.$(DllSuf): obj/btag_dict.$(ObjSuf)
-	$(BuildFromObj)
-
-$(ALL_CASES) : %: %.success
-$(ALL_ROOTMAP_CASES) : %: %.success
-
-ALL_CASES_LOG = $(addsuffix .log,$(ALL_CASES))
-ALL_ROOTMAP_CASES_LOG = $(addsuffix .log,$(ALL_ROOTMAP_CASES))
-
-$(addsuffix .success,$(ALL_CASES) $(ALL_ROOTMAP_CASES)) : %.success: %.log %.ref
-	$(SuccessTestDiff) && touch $@
-
-
-$(ALL_CASES_LOG): %.log: scripts/%.script lib/libjet.$(DllSuf) lib/libbtag.$(DllSuf) lib/libsjet.$(DllSuf) $(UTILS_PREREQ) $(ROOTCORELIBS) $(ROOTCINT) $(ROOTV)
-	$(CMDECHO) $(CALLROOTEXE) -l -b < $< > $@ 2>&1 || handleError.sh --cmd='Execution of $<' --result=$$? --log=$@ --test=$*
-
-$(ALL_ROOTMAP_CASES_LOG): rmap-%.log: scripts/%.script lib/libjet.$(DllSuf) lib/libbtag.$(DllSuf) lib/libsjet.$(DllSuf) $(UTILS_PREREQ) $(ROOTCORELIBS) $(ROOTCINT) $(ROOTV)
-	$(CMDECHO) $(CALLROOTEXE) -l -b scripts/loadrootmap.C < $< > $@ 2>&1 || handleError.sh --cmd='Execution of $<' --result=$$? --log=$@ --test=$*
-
-
-
diff --git a/roottest/root/meta/ROOT-7181/case1.ref b/roottest/root/meta/ROOT-7181/case1.ref
index 254b61f0be9df..4de6c68a33935 100644
--- a/roottest/root/meta/ROOT-7181/case1.ref
+++ b/roottest/root/meta/ROOT-7181/case1.ref
@@ -1,2 +1,3 @@
 
+Processing runscript.C("scripts/case1.script",false)...
 Classinfo for DataVector<xAOD::Jet_v1> is valid
diff --git a/roottest/root/meta/ROOT-7181/case2.ref b/roottest/root/meta/ROOT-7181/case2.ref
index 0d0b2a7145ad4..45b99f628043f 100644
--- a/roottest/root/meta/ROOT-7181/case2.ref
+++ b/roottest/root/meta/ROOT-7181/case2.ref
@@ -1,2 +1,3 @@
 
+Processing runscript.C("scripts/case2.script",false)...
 Classinfo for SDataVector<xAOD::SJet_v1> is valid
diff --git a/roottest/root/meta/ROOT-7181/case3.ref b/roottest/root/meta/ROOT-7181/case3.ref
index f72e441106768..695377fa0dfb3 100644
--- a/roottest/root/meta/ROOT-7181/case3.ref
+++ b/roottest/root/meta/ROOT-7181/case3.ref
@@ -1,2 +1,3 @@
 
+Processing runscript.C("scripts/case3.script",false)...
 TClass for DataVector<xAOD::Jet_v1> is loaded
diff --git a/roottest/root/meta/ROOT-7181/case4.ref b/roottest/root/meta/ROOT-7181/case4.ref
index 995ac8e45c649..e944d63a16135 100644
--- a/roottest/root/meta/ROOT-7181/case4.ref
+++ b/roottest/root/meta/ROOT-7181/case4.ref
@@ -1,2 +1,3 @@
 
+Processing runscript.C("scripts/case4.script",false)...
 Normalized name for DataVector<xAOD::Jet_v1> is : DataVector<xAOD::Jet_v1,DataVector<xAOD::IParticle,DataModel_detail::NoBase> >
diff --git a/roottest/root/meta/ROOT-7181/inc/BTagVertex_v1.h b/roottest/root/meta/ROOT-7181/inc/BTagVertex_v1.h
index 60a061c2678f8..94ab4704b5663 100644
--- a/roottest/root/meta/ROOT-7181/inc/BTagVertex_v1.h
+++ b/roottest/root/meta/ROOT-7181/inc/BTagVertex_v1.h
@@ -20,19 +20,4 @@ namespace xAOD {
    typedef DataVector<BTagging_v1> BTaggingContainer_v1;
 }
 
-#if 0
-template <> struct DataVectorBase<xAOD::BTagVertex_v1>
-{
-   typedef DataVector<xAOD::IParticle > Base;
-   int fBtag;
-};
-
-template <> struct DataVectorBase<xAOD::BTagging_v1>
-{
-   typedef DataVector<xAOD::IParticle > Base;
-   int fBtagging;
-};
-
-#endif
-
 #endif
diff --git a/roottest/root/meta/ROOT-7181/inc/jet_selection.xml b/roottest/root/meta/ROOT-7181/inc/jet_selection.xml
index 82e592d55f937..0e23a3c127eb4 100644
--- a/roottest/root/meta/ROOT-7181/inc/jet_selection.xml
+++ b/roottest/root/meta/ROOT-7181/inc/jet_selection.xml
@@ -27,6 +27,11 @@
    <class name="ElementLinkVector<xAOD::JetContainer_v1>" />
    <class name="std::vector<ElementLinkVector<xAOD::JetContainer_v1> >" />
 
+   <class name="DataVector<xAOD::Jet_v1>" />
+   <class name="ElementLink<DataVector<xAOD::Jet_v1>>" />
+   <class name="std::vector<ElementLink<DataVector<xAOD::Jet_v1>>>" />
+   <class name="SG::AuxTypeVectorFactory<std::vector<ElementLink<DataVector<xAOD::Jet_v1>>>>"/>
+
 <!--   <class name="std::pair<std::string,std::vector<const xAOD::IParticle*> >" /> -->
 <!--
    <class name="std::pair<std::string,std::vector<float> >" />
diff --git a/roottest/root/meta/ROOT-7181/rmap-case1.ref b/roottest/root/meta/ROOT-7181/rmap-case1.ref
index 5689528baca7e..5926a5ed1338c 100644
--- a/roottest/root/meta/ROOT-7181/rmap-case1.ref
+++ b/roottest/root/meta/ROOT-7181/rmap-case1.ref
@@ -1,3 +1,3 @@
 
-Processing scripts/loadrootmap.C...
+Processing runscript.C("scripts/case1.script",true)...
 Classinfo for DataVector<xAOD::Jet_v1> is valid
diff --git a/roottest/root/meta/ROOT-7181/rmap-case2.ref b/roottest/root/meta/ROOT-7181/rmap-case2.ref
index 03a90ffbc68eb..5977840320989 100644
--- a/roottest/root/meta/ROOT-7181/rmap-case2.ref
+++ b/roottest/root/meta/ROOT-7181/rmap-case2.ref
@@ -1,3 +1,3 @@
 
-Processing scripts/loadrootmap.C...
+Processing runscript.C("scripts/case2.script",true)...
 Classinfo for SDataVector<xAOD::SJet_v1> is valid
diff --git a/roottest/root/meta/ROOT-7181/rmap-case3.ref b/roottest/root/meta/ROOT-7181/rmap-case3.ref
index 75adadeed4c81..d055793a817f3 100644
--- a/roottest/root/meta/ROOT-7181/rmap-case3.ref
+++ b/roottest/root/meta/ROOT-7181/rmap-case3.ref
@@ -1,3 +1,3 @@
 
-Processing scripts/loadrootmap.C...
+Processing runscript.C("scripts/case3.script",true)...
 TClass for DataVector<xAOD::Jet_v1> is loaded
diff --git a/roottest/root/meta/ROOT-7181/rmap-case4.ref b/roottest/root/meta/ROOT-7181/rmap-case4.ref
index f5c2ce19b3663..589770da3b73e 100644
--- a/roottest/root/meta/ROOT-7181/rmap-case4.ref
+++ b/roottest/root/meta/ROOT-7181/rmap-case4.ref
@@ -1,3 +1,3 @@
 
-Processing scripts/loadrootmap.C...
+Processing runscript.C("scripts/case4.script",true)...
 Normalized name for DataVector<xAOD::Jet_v1> is : DataVector<xAOD::Jet_v1,DataVector<xAOD::IParticle,DataModel_detail::NoBase> >
diff --git a/roottest/root/meta/ROOT-7181/runscript.C b/roottest/root/meta/ROOT-7181/runscript.C
new file mode 100644
index 0000000000000..ee0e54ddf2d26
--- /dev/null
+++ b/roottest/root/meta/ROOT-7181/runscript.C
@@ -0,0 +1,46 @@
+#include <fstream>
+#include <iostream>
+#include <sstream>
+#include <string>
+
+
+#include "DataVector.h"
+
+void runscript(const std::string &name, bool with_rootmap = false)
+{
+   if (with_rootmap) {
+      int old = gInterpreter->SetClassAutoloading(kFALSE);
+      gInterpreter->LoadLibraryMap("libbtag.rootmap");
+      gInterpreter->LoadLibraryMap("libjet.rootmap");
+      gInterpreter->LoadLibraryMap("libsjet.rootmap");
+      gInterpreter->SetClassAutoloading(old);
+   }
+
+   if (name == "case1") {
+      gSystem->Load("libjet_dictrflx");
+      gSystem->Load("libbtag_dictrflx");
+      TClass::GetClass("SG::AuxTypeVectorFactory<std::vector<ElementLink<DataVector<xAOD::Jet_v1> > > >");
+      auto c = TClass::GetClass("DataVector<xAOD::Jet_v1,DataVector<xAOD::IParticle,DataModel_detail::NoBase>>")->GetClassInfo();
+      printf("Classinfo for DataVector<xAOD::Jet_v1> is %s\n",gInterpreter->ClassInfo_IsValid(c) ? "valid" : "invalid");
+   } else if (name == "case2") {
+      gSystem->Load("libsjet_dictrflx");
+      gSystem->Load("libbtag_dictrflx");
+      TClass::GetClass("SG::AuxTypeVectorFactory<std::vector<ElementLink<SDataVector<xAOD::SJet_v1> > > >");
+      auto c = TClass::GetClass("SDataVector<xAOD::SJet_v1>")->GetClassInfo();
+      printf("Classinfo for SDataVector<xAOD::SJet_v1> is %s\n",gInterpreter->ClassInfo_IsValid(c) ? "valid" : "invalid");
+   } else if (name == "case3") {
+      gSystem->Load("libjet_dictrflx");
+      gSystem->Load("libbtag_dictrflx");
+      auto c = TClass::GetClass("DataVector<xAOD::Jet_v1,DataVector<xAOD::IParticle,DataModel_detail::NoBase>>>");
+      printf("TClass for DataVector<xAOD::Jet_v1> is %s\n",c->IsLoaded() ? "loaded" : "not loaded");
+   } else if (name == "case4") {
+      gSystem->Load("libjet_dictrflx");
+      gSystem->Load("libbtag_dictrflx");
+      gROOT->ProcessLine("DataVector<xAOD::Jet_v1,DataVector<xAOD::IParticle,DataModel_detail::NoBase>> obj;");
+      std::string name;
+      TClassEdit::GetNormalizedName(name,"DataVector<xAOD::Jet_v1,DataVector<xAOD::IParticle,DataModel_detail::NoBase>>");
+      // TClass::GetClass("DataVector<xAOD::Jet_v1>");
+      printf("Normalized name for DataVector<xAOD::Jet_v1> is : %s\n",name.c_str());
+   }
+}
+
diff --git a/roottest/root/meta/ROOT-7181/scripts/case1.script b/roottest/root/meta/ROOT-7181/scripts/case1.script
deleted file mode 100644
index 05272158cc514..0000000000000
--- a/roottest/root/meta/ROOT-7181/scripts/case1.script
+++ /dev/null
@@ -1,6 +0,0 @@
-.L lib/libjet.so
-.L lib/libbtag.so 
-#include "DataVector.h"
-TClass::GetClass("SG::AuxTypeVectorFactory<std::vector<ElementLink<DataVector<xAOD::Jet_v1> > > >");
-auto c = TClass::GetClass("DataVector<xAOD::Jet_v1>")->GetClassInfo();
-printf("Classinfo for DataVector<xAOD::Jet_v1> is %s\n",gInterpreter->ClassInfo_IsValid(c) ? "valid" : "invalid");
diff --git a/roottest/root/meta/ROOT-7181/scripts/case2.script b/roottest/root/meta/ROOT-7181/scripts/case2.script
deleted file mode 100644
index 187e5c72d02ef..0000000000000
--- a/roottest/root/meta/ROOT-7181/scripts/case2.script
+++ /dev/null
@@ -1,7 +0,0 @@
-.L lib/libsjet.so
-.L lib/libbtag.so 
-#include "DataVector.h"
-TClass::GetClass("SG::AuxTypeVectorFactory<std::vector<ElementLink<SDataVector<xAOD::SJet_v1> > > >");
-auto c = TClass::GetClass("SDataVector<xAOD::SJet_v1>")->GetClassInfo();
-printf("Classinfo for SDataVector<xAOD::SJet_v1> is %s\n",gInterpreter->ClassInfo_IsValid(c) ? "valid" : "invalid");
-
diff --git a/roottest/root/meta/ROOT-7181/scripts/case3.script b/roottest/root/meta/ROOT-7181/scripts/case3.script
deleted file mode 100644
index ed02144391419..0000000000000
--- a/roottest/root/meta/ROOT-7181/scripts/case3.script
+++ /dev/null
@@ -1,7 +0,0 @@
-.L lib/libjet.so
-.L lib/libbtag.so 
-#include "DataVector.h"
-auto c = TClass::GetClass("DataVector<xAOD::Jet_v1>");
-printf("TClass for DataVector<xAOD::Jet_v1> is %s\n",c->IsLoaded() ? "loaded" : "not loaded");
-
-
diff --git a/roottest/root/meta/ROOT-7181/scripts/case4.script b/roottest/root/meta/ROOT-7181/scripts/case4.script
deleted file mode 100644
index 9c3e85a5a0105..0000000000000
--- a/roottest/root/meta/ROOT-7181/scripts/case4.script
+++ /dev/null
@@ -1,12 +0,0 @@
-.L lib/libjet.so
-.L lib/libbtag.so 
-#include "DataVector.h"
-DataVector<xAOD::Jet_v1> obj;
-
-std::string name;
-TClassEdit::GetNormalizedName(name,"DataVector<xAOD::Jet_v1>");
-
-// TClass::GetClass("DataVector<xAOD::Jet_v1>");
-
-printf("Normalized name for DataVector<xAOD::Jet_v1> is : %s\n",name.c_str());
-
diff --git a/roottest/root/meta/ROOT-7181/scripts/loadrootmap.C b/roottest/root/meta/ROOT-7181/scripts/loadrootmap.C
deleted file mode 100644
index e7807d5118489..0000000000000
--- a/roottest/root/meta/ROOT-7181/scripts/loadrootmap.C
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-int old = gInterpreter->SetClassAutoloading(kFALSE);
-gInterpreter->LoadLibraryMap("lib/libbtag.rootmap");
-gInterpreter->LoadLibraryMap("lib/libjet.rootmap");
-gInterpreter->LoadLibraryMap("lib/libsjet.rootmap");
-gInterpreter->SetClassAutoloading(old);
-}
-