diff --git a/Event/xAOD/xAODPFlowAthenaPool/CMakeLists.txt b/Event/xAOD/xAODPFlowAthenaPool/CMakeLists.txt
index 06f62fa46bd293422a2c8f5bf0fdc398dba46d1e..cc7dc7c2fdc1904976354b0a5c323ffd1504e5f6 100644
--- a/Event/xAOD/xAODPFlowAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODPFlowAthenaPool/CMakeLists.txt
@@ -22,6 +22,7 @@ atlas_add_poolcnv_library( xAODPFlowAthenaPoolPoolCnv
 
 # 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 )
@@ -29,7 +30,7 @@ find_package( AthenaPoolUtilitiesTest )
 if( ATHENAPOOLUTILITIESTEST_FOUND )
   set( XAODPFLOWATHENAPOOL_REFERENCE_TAG
        xAODPFlowAthenaPoolReference-01-01-00 )
-  run_tpcnv_legacy_test( xAODPFlowAthenaPool_21.0.79   AOD-21.0.79-full
+  run_tpcnv_test( xAODPFlowAthenaPool_21.0.79   AOD-21.0.79-full
                    REQUIRED_LIBRARIES xAODPFlowAthenaPoolPoolCnv
                    REFERENCE_TAG ${XAODPFLOWATHENAPOOL_REFERENCE_TAG} )
 else()
diff --git a/Event/xAOD/xAODPFlowAthenaPool/share/xAODPFlowAthenaPool_21.0.79.ref b/Event/xAOD/xAODPFlowAthenaPool/share/xAODPFlowAthenaPool_21.0.79.ref
index 092f282551c70ad69e708c9568418b87fe0e2f03..518c4e8dbb0d2a237f9c47347f5da512b953a605 100644
--- a/Event/xAOD/xAODPFlowAthenaPool/share/xAODPFlowAthenaPool_21.0.79.ref
+++ b/Event/xAOD/xAODPFlowAthenaPool/share/xAODPFlowAthenaPool_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/xAODPFlowAthenaPool/test/xAODPFlowAthenaPool_21.0.79_test.py b/Event/xAOD/xAODPFlowAthenaPool/test/xAODPFlowAthenaPool_21.0.79_test.py
new file mode 100755
index 0000000000000000000000000000000000000000..a3d3f81fa19f93da8190294cac437f14f96a7c72
--- /dev/null
+++ b/Event/xAOD/xAODPFlowAthenaPool/test/xAODPFlowAthenaPool_21.0.79_test.py
@@ -0,0 +1,21 @@
+#!/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::PFOAuxContainer_v1
+        'JetETMissChargedParticleFlowObjects',
+        'JetETMissNeutralParticleFlowObjects',
+        'TauChargedParticleFlowObjects',
+        'TauHadronicParticleFlowObjects',
+        'TauNeutralParticleFlowObjects',
+        'TauShotParticleFlowObjects',
+             ]
+
+    TPCnvTest(infile, keys)