diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt
index 026dc39d0d57729b484561e410663ea1edb50b8d..2d1d44da7516b3e979b27a3c303d33a3788eb7dd 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt
@@ -37,13 +37,14 @@ atlas_add_dictionary( InDetEventAthenaPoolCnvDict
 
 # 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 )
 if( ATHENAPOOLUTILITIESTEST_FOUND )
    set( INDETEVENTATHENAPOOL_REFERENCE_TAG
         InDetEventAthenaPoolReference-02-00-00 )
-   run_tpcnv_legacy_test( InDetEventTPCnv_16.6.2.1 ESD-16.6.2.1
+   run_tpcnv_test( InDetEventTPCnv_16.6.2.1 ESD-16.6.2.1
                    REFERENCE_TAG ${INDETEVENTATHENAPOOL_REFERENCE_TAG} )
 else()
    message( WARNING
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/test/InDetEventTPCnv_16.6.2.1_test.py b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/test/InDetEventTPCnv_16.6.2.1_test.py
new file mode 100755
index 0000000000000000000000000000000000000000..74b36d6413200213362d461005fa8489de0efe07
--- /dev/null
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/test/InDetEventTPCnv_16.6.2.1_test.py
@@ -0,0 +1,30 @@
+#!/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 = 'esd/ESD-16.6.2.1.pool.root'
+
+    keys = [
+        #InDet::PixelClusterContainer_p3
+        'PixelClusters',
+        #InDet::SCT_ClusterContainer_p2
+        'SCT_Clusters',
+        #InDet::TRT_DriftCircleContainer_p2
+        'TRT_DriftCircles',
+        #InDetLowBetaContainer_tlp1
+        'InDetLowBetaCandidates',
+        #InDet::PixelGangedClusterAmbiguities_p1
+        'PixelClusterAmbiguitiesMap',
+        #InDetRawDataContainer_p1
+        'PixelRDOs',
+        'TRT_RDOs',
+        #SCT_RawDataContainer_p2
+        'SCT_RDOs',
+    ]
+
+    TPCnvTest(infile, keys, useGeoModelSvc=True, doPixel=True, doSCT=True, doTRT=True)