diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest.ref b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest.ref
index 9dc169f72014522133b592f688f28989a0c26a15..b1a1abfbf109e28864dc34f4f72c658bb1f84fa1 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest.ref
+++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest.ref
@@ -8,7 +8,6 @@ Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "LArConditionsTest/LArConditionsTest_jobOptions.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas_Gen.UnixStandardJob.py"
 Py:Athena            INFO including file "AtlasGeoModel/SetGeometryVersion.py"
-AtlasGeoModel/SetGeometryVersion.py is OBSOLETE
 Py:Athena            INFO SetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
 Py:ConfigurableDb    INFO Read module info for 5569 configurables from 10 genConfDb files
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadAndReg_jobOptions.py b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadAndReg_jobOptions.py
index 42f28e4f1213ed70abfbce9b117662b539127416..227be99986fd3c085f2bbfe3aa098029b54c6794 100755
--- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadAndReg_jobOptions.py
+++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadAndReg_jobOptions.py
@@ -21,7 +21,7 @@ DetFlags.digitize.all_setOff()
 from AthenaCommon.GlobalFlags import GlobalFlags
 GlobalFlags.DataSource.set_geant4()
 GlobalFlags.DetGeo.set_atlas()
-include ("AtlasGeoModel/SetGeometryVersion.py")
+from AtlasGeoModel import SetGeometryVersion
 from AtlasGeoModel import GeoModelInit
 include ("LArRawConditions/LArIdMap_ATLAS_jobOptions.py")
 
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg.ref b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg.ref
index 09f0b67af92836afa2b220de879c2afe286a840d..5bcaacb6a78fe60b86104f2c6e7c72ec2880d131 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg.ref
+++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg.ref
@@ -8,7 +8,6 @@ Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "LArConditionsTest/LArConditionsTestReadNoReg_jobOptions.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas_Gen.UnixStandardJob.py"
 Py:Athena            INFO including file "AtlasGeoModel/SetGeometryVersion.py"
-AtlasGeoModel/SetGeometryVersion.py is OBSOLETE
 Py:Athena            INFO SetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
 Py:ConfigurableDb    INFO Read module info for 5569 configurables from 10 genConfDb files
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg_jobOptions.py b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg_jobOptions.py
index 0eec7035d55f1382660c1b96561361c97af97b04..af75f6450779e0e3ed65114f43834ace81bd0bd6 100755
--- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg_jobOptions.py
+++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestReadNoReg_jobOptions.py
@@ -20,7 +20,7 @@ DetFlags.digitize.all_setOff()
 from AthenaCommon.GlobalFlags import globalflags
 globalflags.DataSource.set_Value_and_Lock('geant4')
 globalflags.DetGeo.set_Value_and_Lock('atlas')
-include ("AtlasGeoModel/SetGeometryVersion.py")
+from AtlasGeoModel import SetGeometryVersion
 from AtlasGeoModel import GeoModelInit
 include ("LArRawConditions/LArIdMap_ATLAS_jobOptions.py")
 
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestRead_jobOptions.py b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestRead_jobOptions.py
index e39a8890dc2ce62d73445589dd5c177d34aabfa4..6d64dde28cb123d27b37ffaf915838e21f2665a0 100755
--- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestRead_jobOptions.py
+++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestRead_jobOptions.py
@@ -21,7 +21,7 @@ DetFlags.digitize.all_setOff()
 from AthenaCommon.GlobalFlags import GlobalFlags
 GlobalFlags.DataSource.set_geant4()
 GlobalFlags.DetGeo.set_atlas()
-include ("AtlasGeoModel/SetGeometryVersion.py")
+from AtlasGeoModel import SetGeometryVersion
 from AtlasGeoModel import GeoModelInit
 include ("LArRawConditions/LArIdMap_ATLAS_jobOptions.py")
 
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg.ref b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg.ref
index 9b5e40c3428fbaeacdb12de069724d9c6b93865b..a01c78a81fad33278f5754431476d5a342ad57b5 100644
--- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg.ref
+++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg.ref
@@ -8,7 +8,6 @@ Py:Athena            INFO including file "AthenaCommon/Execution.py"
 Py:Athena            INFO including file "LArConditionsTest/LArConditionsTestWriteNoReg_jobOptions.py"
 Py:Athena            INFO including file "AthenaCommon/Atlas_Gen.UnixStandardJob.py"
 Py:Athena            INFO including file "AtlasGeoModel/SetGeometryVersion.py"
-AtlasGeoModel/SetGeometryVersion.py is OBSOLETE
 Py:Athena            INFO SetGeometryVersion.py obtained major release version 22
 Py:Athena            INFO including file "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py"
 Py:ConfigurableDb    INFO Read module info for 5569 configurables from 10 genConfDb files
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg_jobOptions.py b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg_jobOptions.py
index e8b964fbedea3db72978b51a3e22ef617cde44f2..c14ef73ba6dcf0523da0734f72b8fc4bab2ac9e8 100755
--- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg_jobOptions.py
+++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTestWriteNoReg_jobOptions.py
@@ -21,7 +21,7 @@ DetFlags.digitize.all_setOff()
 from AthenaCommon.GlobalFlags import globalflags
 globalflags.DataSource.set_Value_and_Lock('geant4')
 globalflags.DetGeo.set_Value_and_Lock('atlas')
-include ("AtlasGeoModel/SetGeometryVersion.py")
+from AtlasGeoModel import SetGeometryVersion
 from AtlasGeoModel import GeoModelInit
 include ("LArRawConditions/LArIdMap_ATLAS_jobOptions.py")
 
diff --git a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest_jobOptions.py b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest_jobOptions.py
index bc2b1e3839ff39f5d115d62ce4ed573419c65f01..fc022072006b6132e13dbf291cc4b9671b16f904 100755
--- a/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest_jobOptions.py
+++ b/LArCalorimeter/LArTest/LArConditionsTest/share/LArConditionsTest_jobOptions.py
@@ -25,7 +25,7 @@ DetFlags.digitize.all_setOff()
 from AthenaCommon.GlobalFlags import globalflags
 globalflags.DataSource.set_Value_and_Lock('geant4')
 globalflags.DetGeo.set_Value_and_Lock('atlas')
-include ("AtlasGeoModel/SetGeometryVersion.py")
+from AtlasGeoModel import SetGeometryVersion
 from AtlasGeoModel import GeoModelInit
 include ("LArRawConditions/LArIdMap_ATLAS_jobOptions.py")