diff --git a/Event/xAOD/xAODCaloEventAthenaPool/CMakeLists.txt b/Event/xAOD/xAODCaloEventAthenaPool/CMakeLists.txt
index 701b8380bb57f227f3cc1187a56665b589e1e7a1..94e47eebce8ad8af75fb63ae87971f985f75488d 100644
--- a/Event/xAOD/xAODCaloEventAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODCaloEventAthenaPool/CMakeLists.txt
@@ -19,6 +19,7 @@ atlas_add_poolcnv_library( xAODCaloEventAthenaPoolPoolCnv
 
 # Install files from the package.
 atlas_install_joboptions( share/*.py )
+atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
 
 # Set up (a) test(s) for the converter(s):
 find_package( AthenaPoolUtilitiesTest )
@@ -26,10 +27,10 @@ find_package( AthenaPoolUtilitiesTest )
 if( ATHENAPOOLUTILITIESTEST_FOUND )
   set( XAODCALOEVENTATHENAPOOL_REFERENCE_TAG
        xAODCaloEventAthenaPoolReference-01-01-00 )
-  run_tpcnv_legacy_test( xAODCaloEventAthenaPool_20.1.7.2   AOD-20.1.7.2-full
+  run_tpcnv_test( xAODCaloEventAthenaPool_20.1.7.2   AOD-20.1.7.2-full
                    REQUIRED_LIBRARIES xAODCaloEventAthenaPoolPoolCnv
                    REFERENCE_TAG ${XAODCALOEVENTATHENAPOOL_REFERENCE_TAG} )
-  run_tpcnv_legacy_test( xAODCaloEventAthenaPool_21.0.79   AOD-21.0.79-full
+  run_tpcnv_test( xAODCaloEventAthenaPool_21.0.79   AOD-21.0.79-full
                    REQUIRED_LIBRARIES xAODCaloEventAthenaPoolPoolCnv
                    REFERENCE_TAG ${XAODCALOEVENTATHENAPOOL_REFERENCE_TAG} )
 else()
diff --git a/Event/xAOD/xAODCaloEventAthenaPool/share/xAODCaloEventAthenaPool_21.0.79.ref b/Event/xAOD/xAODCaloEventAthenaPool/share/xAODCaloEventAthenaPool_21.0.79.ref
index 60fb75d54f5f375d2960ec790d29c6eda6872714..d888b6de93e4cf67095207fd2ca76a874467f664 100644
--- a/Event/xAOD/xAODCaloEventAthenaPool/share/xAODCaloEventAthenaPool_21.0.79.ref
+++ b/Event/xAOD/xAODCaloEventAthenaPool/share/xAODCaloEventAthenaPool_21.0.79.ref
@@ -510,8 +510,6 @@ IOVDbSvc             INFO Disconnecting from COOLOFL_TRT/OFLP200
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] C634B46D-ECB2-A045-91CC-00A82369D887
 Domain[ROOT_All]     INFO                           /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000070.gen.COND/cond12_data.000029.gen.COND._0001.pool.root
 RootDatabase.open    INFO /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000070.gen.COND/cond12_data.000029.gen.COND._0001.pool.root File version:53005
-PixelDetectorMa...WARNING Cannot set AlignableTransform for identifier  [2.1.0.0.0.-4.256.0] at level 2
-PixelDetectorMa...WARNING Subsequent WARNINGS will be printed at DEBUG level.
 PixelDetectorMa...   INFO Processing IBLDist alignment container with key (/Indet/IBLDist) and alignment folder pointing to /Indet/Align
 Domain[ROOT_All]     INFO ->  Access   DbDatabase   READ      [ROOT_All] D67CA215-C5CB-DF11-954C-000423DC2158
 Domain[ROOT_All]     INFO                           /home/sss/atlas/DBRelease/current/poolcond/cond09_mc.000019.gen.COND/cond09_mc.000019.gen.COND._0010.pool.root
diff --git a/Event/xAOD/xAODCaloEventAthenaPool/test/xAODCaloEventAthenaPool_20.1.7.2_test.py b/Event/xAOD/xAODCaloEventAthenaPool/test/xAODCaloEventAthenaPool_20.1.7.2_test.py
new file mode 100755
index 0000000000000000000000000000000000000000..2e4154e6f8708821b2188c28e720b72c0c577b3a
--- /dev/null
+++ b/Event/xAOD/xAODCaloEventAthenaPool/test/xAODCaloEventAthenaPool_20.1.7.2_test.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+"""
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+
+from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
+
+if __name__ == "__main__":
+
+    infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
+    keys = [
+        #xAOD::CaloCluster
+        'CaloCalTopoClusters',
+        'ForwardElectronClusters',
+        'HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFex',
+        'InDetTrackParticlesAssociatedClusters',
+        'MuonClusterCollection',
+        'TauPi0Clusters',
+        'egammaClusters',
+             ]
+
+    TPCnvTest(infile, keys)
diff --git a/Event/xAOD/xAODCaloEventAthenaPool/test/xAODCaloEventAthenaPool_21.0.79_test.py b/Event/xAOD/xAODCaloEventAthenaPool/test/xAODCaloEventAthenaPool_21.0.79_test.py
new file mode 100755
index 0000000000000000000000000000000000000000..2f7e4720ba467a38b793b5339e120cf7628f438f
--- /dev/null
+++ b/Event/xAOD/xAODCaloEventAthenaPool/test/xAODCaloEventAthenaPool_21.0.79_test.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+"""
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+
+from AthenaPoolUtilities.TPCnvTestConfig import TPCnvTest
+
+if __name__ == "__main__":
+
+    infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
+    keys = [
+        #xAOD::CaloCluster
+        'CaloCalTopoClusters',
+        'ForwardElectronClusters',
+        'HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFex',
+        'InDetTrackParticlesAssociatedClusters',
+        'MuonClusterCollection',
+        'TauPi0Clusters',
+        'egammaClusters',
+             ]
+
+    TPCnvTest(infile, keys)