diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt b/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt
index 1fb971d1aad29311443ab6057484c9bdd9542840..43fd9df07c5626726cd5cb990834573b3169fe91 100644
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt
@@ -42,3 +42,21 @@ atlas_add_poolcnv_library( TrkEventAthenaPoolPoolCnv
 atlas_install_headers( TrkEventAthenaPool )
 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( TrkEventTPCnv_14.5.0   AOD-14.5.0-full )
+  run_tpcnv_test( TrkEventTPCnv_15.6.7   AOD-15.6.7-full )
+  run_tpcnv_test( TrkEventTPCnv_16.6.2.1 AOD-16.6.2.1-full )
+  run_tpcnv_test( TrkEventTPCnv_17.2.8   AOD-17.2.8-full )
+  run_tpcnv_test( TrkEventTPCnv_18.0.0   AOD-18.0.0-full )
+  run_tpcnv_test( TrkEventTPCnv_20.1.7.2 ESD-20.1.7.2 )
+else()
+   message( WARNING "Couldn't find AthenaPoolUtilitiesTest. No test(s) set up." )
+endif()   
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_18.0.0_test.py b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_18.0.0_test.py
index 44d3cf282993a5d354d783f706985c3d98bdf471..20898f1e0e3b28a76201cd01b43b609eb46ab36f 100644
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_18.0.0_test.py
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_18.0.0_test.py
@@ -18,7 +18,7 @@ keys = [
     'MuGirlSegments',
          ]
 
-from AthenaCommon.JobProperties import jobproperties
-jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
+#from AthenaCommon.JobProperties import jobproperties
+#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
 
 include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_20.1.7.2_test.py b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_20.1.7.2_test.py
index 98e2179791b7b0ba8bccec7fc57200699fd2917e..5a119dc5570c7d0cdd909febac5337712df9eb15 100644
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_20.1.7.2_test.py
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_20.1.7.2_test.py
@@ -20,7 +20,7 @@ keys = [
     'MuonSegments',
          ]
 
-from AthenaCommon.JobProperties import jobproperties
-jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
+#from AthenaCommon.JobProperties import jobproperties
+#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
 
 include ('AthenaPoolUtilities/TPCnvTest.py')