diff --git a/Tools/ValgrindRTTJobs/CMakeLists.txt b/Tools/ValgrindRTTJobs/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2ca25a860b2283819fb753c43b2fd527b6c3ee0b
--- /dev/null
+++ b/Tools/ValgrindRTTJobs/CMakeLists.txt
@@ -0,0 +1,23 @@
+################################################################################
+# Package: ValgrindRTTJobs
+################################################################################
+
+# Declare the package name:
+atlas_subdir( ValgrindRTTJobs )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PRIVATE
+                          Control/AthenaBaseComps
+                          GaudiKernel
+                          TestPolicy
+                          Tools/PyJobTransformsCore )
+
+# Component(s) in the package:
+atlas_add_component( ValgrindRTTJobs
+                     src/*.cxx
+                     src/components/*.cxx
+                     LINK_LIBRARIES AthenaBaseComps GaudiKernel )
+
+# Install files from the package:
+atlas_install_runtime( test/ValgrindRTTJobs_TestConfiguration.xml share/PostProcessValgrind.py share/memConsumption.C share/historyNightlies.C share/*.supp share/processValgrindOutput.sh share/dhat-postprocess.pl )
+
diff --git a/Tools/ValgrindRTTJobs/test/ValgrindRTTJobs_TestConfiguration.xml b/Tools/ValgrindRTTJobs/test/ValgrindRTTJobs_TestConfiguration.xml
index 67ddbf98c8ede1a755eae77198a3283ce7ea598d..8255ecd8691ed1a6792c4a7a942a707349fb531a 100755
--- a/Tools/ValgrindRTTJobs/test/ValgrindRTTJobs_TestConfiguration.xml
+++ b/Tools/ValgrindRTTJobs/test/ValgrindRTTJobs_TestConfiguration.xml
@@ -20,75 +20,6 @@
       <displayComponent>Athena-Core</displayComponent>
     </classification>
 
-    <jobTransform userJobId="RAWtoESD_MC_q221">
-      <doc>RAWtoESD_MC_q221</doc>
-      <jobTransformJobName>RAWtoESD_MC_q221</jobTransformJobName>
-      <jobTransformCmd>
-	cp ${ROOTSYS}/etc/valgrind-root.supp valgrind-root.supp; 
-	get_files newSuppressions.supp; 
-	get_files oracleDB.supp; 
-	get_files root.supp; get_files valgrindRTT.supp; 
-	get_files Gaudi.supp; 
-	get_files valgrind-python.supp ; 
-	Reco_tf.py --inputRDOFile=root://eosatlas//eos/atlas/user/a/atlaspmb/mc/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r6220_tid05191878_00/RDO.05191878._000121.pool.root.1 --outputESDFile=myESD.pool.root --maxEvents=10 --execOnly  --athenaopts='--config-only=rec.pkl --stdcmalloc' --AMI q221; 
-	valgrind --smc-check=all --tool=memcheck --leak-check=full --suppressions=root.supp --suppressions=valgrind-root.supp --suppressions=newSuppressions.supp --suppressions=oracleDB.supp --suppressions=valgrindRTT.supp --suppressions=Gaudi.supp --suppressions=valgrind-python.supp --num-callers=30 --track-origins=yes `which python` `which athena.py` rec.pkl  
-      </jobTransformCmd>
-      <group>Valgrind_JobTransforms</group>
-      <queue>long</queue>
-    </jobTransform>
-
-   <jobTransform userJobId="ESDtoAOD_MC_q221">
-      <doc>ESDtoAOD_MC_q221</doc>
-      <jobTransformJobName>ESDtoAOD_MC_q221</jobTransformJobName>
-      <jobTransformCmd>
-	cp ${ROOTSYS}/etc/valgrind-root.supp valgrind-root.supp; 
-	get_files newSuppressions.supp; 
-	get_files oracleDB.supp; 
-	get_files root.supp; get_files valgrindRTT.supp; 
-	get_files Gaudi.supp; 
-	get_files valgrind-python.supp ; 
-	Reco_tf.py --inputRDOFile=root://eosatlas//eos/atlas/user/a/atlaspmb/mc/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r6220_tid05191878_00/RDO.05191878._000121.pool.root.1 --outputESDFile=myESD.pool.root --maxEvents=10 --AMI q221
-	Reco_tf.py --inputESDFile=myESD.pool.root --outputAODFile=myAOD.pool.root --preInclude=RecExCommon/ValgrindTweaks.py --maxEvents=10 --execOnly  --athenaopts='--config-only=rec.pkl --stdcmalloc' --AMI q221; 
-	valgrind --smc-check=all --tool=memcheck --leak-check=full --suppressions=root.supp --suppressions=valgrind-root.supp --suppressions=newSuppressions.supp --suppressions=oracleDB.supp --suppressions=valgrindRTT.supp --suppressions=Gaudi.supp --suppressions=valgrind-python.supp --num-callers=30 --track-origins=yes `which python` `which athena.py` rec.pkl  
-      </jobTransformCmd>
-      <group>Valgrind_JobTransforms</group>
-      <queue>long</queue>
-    </jobTransform>
-
-    <jobTransform userJobId="RAWtoESD_DATA_q431">
-      <doc>RAWtoESD_DATA_q431</doc>
-      <jobTransformJobName>RAWtoESD_DATA_q431</jobTransformJobName>
-      <jobTransformCmd>
-	cp ${ROOTSYS}/etc/valgrind-root.supp valgrind-root.supp; 
-	get_files newSuppressions.supp; 
-	get_files oracleDB.supp; 
-	get_files root.supp; get_files valgrindRTT.supp; 
-	get_files Gaudi.supp; 
-	get_files valgrind-python.supp ; 
-	Reco_tf.py --inputRDOFile=root://eosatlas//eos/atlas/user/a/atlaspmb/mc/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r6220_tid05191878_00/RDO.05191878._000121.pool.root.1 --outputESDFile=myESD.pool.root --maxEvents=10 --execOnly  --athenaopts='--config-only=rec.pkl --stdcmalloc' --AMI q431
-	valgrind --smc-check=all --tool=memcheck --leak-check=full --suppressions=root.supp --suppressions=valgrind-root.supp --suppressions=newSuppressions.supp --suppressions=oracleDB.supp --suppressions=valgrindRTT.supp --suppressions=Gaudi.supp --suppressions=valgrind-python.supp --num-callers=30 --track-origins=yes `which python` `which athena.py` rec.pkl  
-      </jobTransformCmd>
-      <group>Valgrind_JobTransforms</group>
-      <queue>long</queue>
-    </jobTransform>
-
-   <jobTransform userJobId="ESDtoAOD_DATA_q431">
-      <doc>Short Testjob</doc>
-      <jobTransformJobName>ESDtoAOD_DATA_q431</jobTransformJobName>
-      <jobTransformCmd>
-	cp ${ROOTSYS}/etc/valgrind-root.supp valgrind-root.supp; 
-	get_files newSuppressions.supp; 
-	get_files oracleDB.supp; 
-	get_files root.supp; get_files valgrindRTT.supp; 
-	get_files Gaudi.supp; 
-	get_files valgrind-python.supp ; 
-	Reco_tf.py --inputRDOFile=root://eosatlas//eos/atlas/user/a/atlaspmb/mc/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r6220_tid05191878_00/RDO.05191878._000121.pool.root.1 --outputESDFile=myESD.pool.root --maxEvents=10 --AMI q431
-	Reco_tf.py --inputESDFile=myESD.pool.root --outputAODFile=myAOD.pool.root --preInclude=RecExCommon/ValgrindTweaks.py --maxEvents=10 --execOnly  --athenaopts='--config-only=rec.pkl --stdcmalloc' --AMI q221; 
-	valgrind --smc-check=all --tool=memcheck --leak-check=full --suppressions=root.supp --suppressions=valgrind-root.supp --suppressions=newSuppressions.supp --suppressions=oracleDB.supp --suppressions=valgrindRTT.supp --suppressions=Gaudi.supp --suppressions=valgrind-python.supp --num-callers=30 --track-origins=yes `which python` `which athena.py` rec.pkl  
-      </jobTransformCmd>
-      <group>Valgrind_JobTransforms</group>
-      <queue>long</queue>
-    </jobTransform>
 
      <jobTransform userJobId="RAWtoAOD_MC_q221_AthMemoryAuditor_tcmalloc">
       <doc>RAW to AOD tcmalloc</doc>