diff --git a/Reconstruction/egamma/egammaAthenaPool/CMakeLists.txt b/Reconstruction/egamma/egammaAthenaPool/CMakeLists.txt
index 44a5ec4d8b099555f2cf7d659d51e56a8e37c755..d7d8a2c5661f6ba864671cf7c5c4a28ced73277f 100644
--- a/Reconstruction/egamma/egammaAthenaPool/CMakeLists.txt
+++ b/Reconstruction/egamma/egammaAthenaPool/CMakeLists.txt
@@ -27,3 +27,18 @@ atlas_add_poolcnv_library( egammaAthenaPoolPoolCnv
 atlas_install_headers( egammaAthenaPool )
 atlas_install_joboptions( share/*.py )
 
+# Set up (a) test(s) for the converter(s):
+if( IS_DIRECTORY ${CMAKE_SOURCE_DIR}/Database/AthenaPOOL/AthenaPoolUtilities )
+   set( AthenaPoolUtilitiesTest_DIR
+      ${CMAKE_SOURCE_DIR}/Database/AthenaPOOL/AthenaPoolUtilities/cmake )
+endif()
+find_package( AthenaPoolUtilitiesTest )
+
+if( ATHENAPOOLUTILITIESTEST_FOUND )
+  run_tpcnv_test( egammaEventTPCnv_15.1.0    AOD-15.1.0-full )
+  run_tpcnv_test( egammaEventTPCnv_15.6.9    AOD-15.6.9-full )
+  run_tpcnv_test( egammaEventTPCnv_16.6.7.1  AOD-16.6.7.1-full )
+  run_tpcnv_test( egammaEventTPCnv_18.0.0    AOD-18.0.0-full )
+else()
+   message( WARNING "Couldn't find AthenaPoolUtilitiesTest. No test(s) set up." )
+endif()   
diff --git a/Reconstruction/egamma/egammaAthenaPool/cmt/requirements b/Reconstruction/egamma/egammaAthenaPool/cmt/requirements
index ea01477e91304b65435a8adeb54ee569e502cb86..02c18c98388b091755501680ed59d50aa89de54c 100755
--- a/Reconstruction/egamma/egammaAthenaPool/cmt/requirements
+++ b/Reconstruction/egamma/egammaAthenaPool/cmt/requirements
@@ -62,4 +62,3 @@ apply_pattern athenarun_test \
    options="egammaAthenaPool/egammaEventTPCnv_18.0.0_test.py" \
    pre_script="${ATHENAPOOLUTILITIESROOT}/share/pre_tpcnvtest.sh egammaEventTPCnv_18.0.0" \
    post_script="${ATHENAPOOLUTILITIESROOT}/share/post_tpcnvtest.sh egammaEventTPCnv_18.0.0"
-
diff --git a/Reconstruction/egamma/egammaAthenaPool/share/egammaEventTPCnv_16.6.7.1_test.py b/Reconstruction/egamma/egammaAthenaPool/share/egammaEventTPCnv_16.6.7.1_test.py
index e4699f541fdb4601bd0ff5034b4784fe546011d4..61e65f2d6911a0d968a617dab6da9778eaadcedc 100644
--- a/Reconstruction/egamma/egammaAthenaPool/share/egammaEventTPCnv_16.6.7.1_test.py
+++ b/Reconstruction/egamma/egammaAthenaPool/share/egammaEventTPCnv_16.6.7.1_test.py
@@ -19,7 +19,4 @@ keys = [
     # Dumped as part of the above.
          ]
 
-from AthenaCommon.JobProperties import jobproperties
-jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-
 include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Reconstruction/egamma/egammaAthenaPool/share/egammaEventTPCnv_18.0.0_test.py b/Reconstruction/egamma/egammaAthenaPool/share/egammaEventTPCnv_18.0.0_test.py
index 7a9f9714ef92cd1df11063ec86e9de6154777755..f1331d457ebea21b5e4a26fe4f269bb9bcb6de57 100644
--- a/Reconstruction/egamma/egammaAthenaPool/share/egammaEventTPCnv_18.0.0_test.py
+++ b/Reconstruction/egamma/egammaAthenaPool/share/egammaEventTPCnv_18.0.0_test.py
@@ -15,7 +15,4 @@ keys = [
     # Dumped as part of the above.
          ]
 
-from AthenaCommon.JobProperties import jobproperties
-jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-
 include ('AthenaPoolUtilities/TPCnvTest.py')