diff --git a/Event/EventAthenaPool/CMakeLists.txt b/Event/EventAthenaPool/CMakeLists.txt
index d27314cb55e0dce7c54ab8aeaee4081d03c67622..be53c3aed9902d4c6de4cb7698e12ecaeafa703c 100644
--- a/Event/EventAthenaPool/CMakeLists.txt
+++ b/Event/EventAthenaPool/CMakeLists.txt
@@ -13,6 +13,7 @@ atlas_add_poolcnv_library( EventAthenaPoolPoolCnv
 
 # 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 )
@@ -20,13 +21,13 @@ find_package( AthenaPoolUtilitiesTest )
 if( ATHENAPOOLUTILITIESTEST_FOUND AND NOT GENERATIONBASE )
   set( EVENTATHENAPOOL_REFERENCE_TAG
        EventAthenaPoolReference-01-00-00 )
-  run_tpcnv_legacy_test( EventTPCnv_15.0.0   AOD-15.0.0-full
+  run_tpcnv_test( EventTPCnv_15.0.0   AOD-15.0.0-full
                   REFERENCE_TAG ${EVENTATHENAPOOL_REFERENCE_TAG} )
-  run_tpcnv_legacy_test( EventTPCnv_17.5.0   AOD-17.5.0-full
+  run_tpcnv_test( EventTPCnv_17.5.0   AOD-17.5.0-full
                   REFERENCE_TAG ${EVENTATHENAPOOL_REFERENCE_TAG} )
-  run_tpcnv_legacy_test( EventTPCnv_18.0.0   AOD-18.0.0-full
+  run_tpcnv_test( EventTPCnv_18.0.0   AOD-18.0.0-full
                   REFERENCE_TAG ${EVENTATHENAPOOL_REFERENCE_TAG} )
-  run_tpcnv_legacy_test( EventTPCnv_20.1.7.2 ESD-20.1.7.2
+  run_tpcnv_test( EventTPCnv_20.1.7.2 ESD-20.1.7.2
                   REFERENCE_TAG ${EVENTATHENAPOOL_REFERENCE_TAG} )
 elseif( NOT ATHENAPOOLUTILITIESTEST_FOUND )
    message( WARNING
diff --git a/Event/EventAthenaPool/test/EventTPCnv_15.0.0_test.py b/Event/EventAthenaPool/test/EventTPCnv_15.0.0_test.py
new file mode 100755
index 0000000000000000000000000000000000000000..852e4030ad12dac8e55f4f4de5d551b78fad787c
--- /dev/null
+++ b/Event/EventAthenaPool/test/EventTPCnv_15.0.0_test.py
@@ -0,0 +1,19 @@
+#!/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-15.0.0/AOD-15.0.0-full.pool.root'
+
+    keys = [
+        #EventInfo_p2
+        'McEventInfo',
+
+        #EventStreamInfo_p1
+        'InputMetaDataStore/StreamAOD'
+    ]
+
+    TPCnvTest(infile, keys, useIOVDbSvc=True)
diff --git a/Event/EventAthenaPool/test/EventTPCnv_17.5.0_test.py b/Event/EventAthenaPool/test/EventTPCnv_17.5.0_test.py
new file mode 100755
index 0000000000000000000000000000000000000000..6f05fc8e8c5c3ecdd4f29856e5801ff1cc9e0650
--- /dev/null
+++ b/Event/EventAthenaPool/test/EventTPCnv_17.5.0_test.py
@@ -0,0 +1,19 @@
+#!/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-17.5.0/AOD-17.5.0-full.pool.root'
+
+    keys = [
+        #EventInfo_p3
+        'McEventInfo',
+
+        #EventStreamInfo_p2
+        'InputMetaDataStore/StreamAOD',
+    ]
+
+    TPCnvTest(infile, keys, useIOVDbSvc=True)
diff --git a/Event/EventAthenaPool/test/EventTPCnv_18.0.0_test.py b/Event/EventAthenaPool/test/EventTPCnv_18.0.0_test.py
new file mode 100755
index 0000000000000000000000000000000000000000..764bd4897a49347c53af8ad1284fe63135aa060c
--- /dev/null
+++ b/Event/EventAthenaPool/test/EventTPCnv_18.0.0_test.py
@@ -0,0 +1,19 @@
+#!/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-18.0.0/AOD-18.0.0-full.pool.root'
+
+    keys = [
+        #EventInfo_p4
+        'McEventInfo',
+
+        #EventStreamInfo_p2
+        'InputMetaDataStore/StreamAOD',
+    ]
+
+    TPCnvTest(infile, keys, useIOVDbSvc=True)
diff --git a/Event/EventAthenaPool/test/EventTPCnv_20.1.7.2_test.py b/Event/EventAthenaPool/test/EventTPCnv_20.1.7.2_test.py
new file mode 100755
index 0000000000000000000000000000000000000000..06d6092628fbf1e3bd5b9aa66237a5824abfc0ee
--- /dev/null
+++ b/Event/EventAthenaPool/test/EventTPCnv_20.1.7.2_test.py
@@ -0,0 +1,19 @@
+#!/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-20.1.7.2.pool.root'
+
+    keys = [
+        #EventStreamInfo_p3
+        'InputMetaDataStore/StreamESD',
+
+        #PileUpEventInfo_p5
+        'OverlayEvent',
+    ]
+
+    TPCnvTest(infile, keys, useIOVDbSvc=True)