diff --git a/Event/xAOD/xAODTruthAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTruthAthenaPool/CMakeLists.txt
index 3455fb87b36d2f8278444b71af58c471294e940b..ef792076eb5209597652f3606982422caae72a62 100644
--- a/Event/xAOD/xAODTruthAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODTruthAthenaPool/CMakeLists.txt
@@ -28,6 +28,7 @@ atlas_add_poolcnv_library( xAODTruthAthenaPoolPoolCnv
 
 # 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 )
@@ -36,7 +37,7 @@ if( ATHENAPOOLUTILITIESTEST_FOUND AND NOT SIMULATIONBASE
    AND NOT GENERATIONBASE )
    set( XAODTRUTHATHENAPOOL_REFERENCE_TAG
       xAODTruthAthenaPoolReference-01-01-00 )
-   run_tpcnv_legacy_test( xAODTruthAthenaPool_21.0.79   AOD-21.0.79-full
+   run_tpcnv_test( xAODTruthAthenaPool_21.0.79   AOD-21.0.79-full
       REQUIRED_LIBRARIES xAODTruthAthenaPoolPoolCnv
       REFERENCE_TAG ${XAODTRUTHATHENAPOOL_REFERENCE_TAG} )
 elseif( NOT ATHENAPOOLUTILITIESTEST_FOUND )
diff --git a/Event/xAOD/xAODTruthAthenaPool/share/xAODTruthAthenaPool_21.0.79.ref b/Event/xAOD/xAODTruthAthenaPool/share/xAODTruthAthenaPool_21.0.79.ref
index 5c40ceee3e55cc67c90da14b46b08e18361cfbaa..177e04bef08eb07e885f7e20bbad2574af6879d6 100644
--- a/Event/xAOD/xAODTruthAthenaPool/share/xAODTruthAthenaPool_21.0.79.ref
+++ b/Event/xAOD/xAODTruthAthenaPool/share/xAODTruthAthenaPool_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/xAODTruthAthenaPool/test/xAODTruthAthenaPool_21.0.79_test.py b/Event/xAOD/xAODTruthAthenaPool/test/xAODTruthAthenaPool_21.0.79_test.py
new file mode 100755
index 0000000000000000000000000000000000000000..0f6816c00729dbce9fe0819189ab505c2c4aeb88
--- /dev/null
+++ b/Event/xAOD/xAODTruthAthenaPool/test/xAODTruthAthenaPool_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::TruthEventAuxContainer_v1
+        'TruthEvents',
+
+        #xAOD::TruthParticleAuxContainer_v1
+        'MuonTruthParticles',
+
+        #xAOD::TruthVertexAuxContainer_v1
+        'TruthVertices',
+    ]
+
+    TPCnvTest(infile, keys)#, useGeoModelSvc=True, doLAr=True, doTile=True)