diff --git a/Event/EventBookkeeperAthenaPool/CMakeLists.txt b/Event/EventBookkeeperAthenaPool/CMakeLists.txt
index 33252f7aac214a6b427bb45e7dde12b8c6fca4db..dc5ccdccfaa9fadf4da73c568a9abc6b7a08953f 100644
--- a/Event/EventBookkeeperAthenaPool/CMakeLists.txt
+++ b/Event/EventBookkeeperAthenaPool/CMakeLists.txt
@@ -15,6 +15,7 @@ atlas_add_poolcnv_library( EventBookkeeperAthenaPoolPoolCnv
 
 # 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 )
@@ -22,9 +23,9 @@ find_package( AthenaPoolUtilitiesTest )
 if( ATHENAPOOLUTILITIESTEST_FOUND AND NOT GENERATIONBASE )
   set( EVENTBOOKKEEPERATHENAPOOL_REFERENCE_TAG
        EventBookkeeperAthenaPoolReference-01-00-00 )
-  run_tpcnv_legacy_test( EventBookkeeperTPCnv_16.0.0   AOD-16.0.0-full
+  run_tpcnv_test( EventBookkeeperTPCnv_16.0.0   AOD-16.0.0-full
                   REFERENCE_TAG ${EVENTBOOKKEEPERATHENAPOOL_REFERENCE_TAG} )
-  run_tpcnv_legacy_test( EventBookkeeperTPCnv_18.0.0   AOD-18.0.0-full
+  run_tpcnv_test( EventBookkeeperTPCnv_18.0.0   AOD-18.0.0-full
                   REFERENCE_TAG ${EVENTBOOKKEEPERATHENAPOOL_REFERENCE_TAG} )
 elseif( NOT ATHENAPOOLUTILITIESTEST_FOUND )
    message( WARNING
diff --git a/Event/EventBookkeeperAthenaPool/test/EventBookkeeperTPCnv_16.0.0_test.py b/Event/EventBookkeeperAthenaPool/test/EventBookkeeperTPCnv_16.0.0_test.py
new file mode 100755
index 0000000000000000000000000000000000000000..1f1bb17c6a2fa30b5c105691cb662efc8811a52c
--- /dev/null
+++ b/Event/EventBookkeeperAthenaPool/test/EventBookkeeperTPCnv_16.0.0_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-16.0.0/AOD-16.0.0-full.pool.root'
+    keys = [
+        #EventBookkeeperCollection_p1
+        'InputMetaDataStore/EventBookkeepers@4',
+        'InputMetaDataStore/EventSelector.Counter',
+
+        #SkimDecisionCollection_p1
+        'StreamAOD_SkimDecisionsContainer',
+        'StreamESD_SkimDecisionsContainer',
+             ]
+
+    TPCnvTest(infile, keys, useIOVDbSvc=True)
+
diff --git a/Event/EventBookkeeperAthenaPool/test/EventBookkeeperTPCnv_18.0.0_test.py b/Event/EventBookkeeperAthenaPool/test/EventBookkeeperTPCnv_18.0.0_test.py
new file mode 100755
index 0000000000000000000000000000000000000000..57bec4745766f5a50f60c5652038bdc47b40e43a
--- /dev/null
+++ b/Event/EventBookkeeperAthenaPool/test/EventBookkeeperTPCnv_18.0.0_test.py
@@ -0,0 +1,20 @@
+#!/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 = [
+        #EventBookkeeperCollection_p2
+        'InputMetaDataStore/IncompleteEventBookkeepers',
+        'InputMetaDataStore/EventBookkeepers@4',
+
+        #SkimDecisionCollection_p1
+        'StreamESD_SkimDecisionsContainer',
+             ]
+
+    TPCnvTest(infile, keys, useIOVDbSvc=True)
+