diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoRead.py b/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoRead.py
index 9e0a61f01f813a6d2a71d6372004f676a4cedcf1..1f5a6dc1e142de1db706bef36df65fe2dc457068 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoRead.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoRead.py
@@ -3,9 +3,8 @@
 
 from AthenaConfiguration.AllConfigFlags import initConfigFlags
 from AthenaConfiguration.ComponentFactory import CompFactory
-#from AthenaConfiguration.TestDefaults import defaultGeometryTags
 from AthenaConfiguration.Utils import setupLoggingLevels
-
+import sys
 
 flags=initConfigFlags()
 #Set a number of flags to avoid input-file peeking
@@ -52,4 +51,4 @@ acc.getService("GeoModelSvc").IgnoreTagDifference = True
 
 setupLoggingLevels(flags,acc)
 
-acc.run()
+sys.exit(acc.run().isFailure())
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoReadWrite.py b/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoReadWrite.py
index e3cebdb6a730d9355db26585d606ff988a660271..d074ccfe2a742b4c38a8e3516e7523644fb72665 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoReadWrite.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoReadWrite.py
@@ -3,7 +3,6 @@
 
 from AthenaConfiguration.AllConfigFlags import initConfigFlags
 from AthenaConfiguration.ComponentFactory import CompFactory
-#from AthenaConfiguration.TestDefaults import defaultGeometryTags
 from AthenaConfiguration.Utils import setupLoggingLevels
 
 def eventInfoTestCfg(step=1):
@@ -63,9 +62,9 @@ def eventInfoTestCfg(step=1):
     # Change output file catalog to avoid races.
     acc.getService("PoolSvc").WriteCatalog = 'file:EventInfoTests_catalog.xml'
 
-    #Tag differnces are intentional here
+    #Tag differences are intentional here
     acc.getService("GeoModelSvc").IgnoreTagDifference = True 
 
     setupLoggingLevels(flags,acc)
 
-    acc.run()
+    return acc.run().isFailure()
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWrite.py b/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWrite.py
index cd8f11bc5cba7c3caa6aee50ec08e3e2d9c9820e..b00ba9f35c4ea96f2e5cd833875f6476e0345fe6 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWrite.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWrite.py
@@ -6,6 +6,7 @@ from AthenaConfiguration.ComponentFactory import CompFactory
 from AthenaConfiguration.TestDefaults import defaultGeometryTags
 from AthenaConfiguration.Utils import setupLoggingLevels
 from Campaigns.Utils import Campaign
+import sys
 
 #Set a number of flags to avoid input-file peeking
 flags=initConfigFlags()
@@ -65,4 +66,4 @@ acc.getService("PoolSvc").WriteCatalog = 'file:EventInfoTests_catalog.xml'
 
 setupLoggingLevels(flags,acc)
 
-acc.run(25)
+sys.exit(acc.run(25).isFailure())
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWriteStep2.py b/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWriteStep2.py
index 5b9b08e261e63913fbfc0a48dfe7edad4f4565d1..a5494f55784a525ddaff1684b1f46b4f7d156e02 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWriteStep2.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWriteStep2.py
@@ -1,5 +1,6 @@
 # Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 from AthenaPoolTest.EventInfoReadWrite import eventInfoTestCfg
+import sys
 
-eventInfoTestCfg(2)
+sys.exit(eventInfoTestCfg(2))
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWriteStep3.py b/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWriteStep3.py
index 98a976a433134b21d1a931ca8841bb9bb6771a30..59d709959f99cb2f02ff2277c491927b9534b753 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWriteStep3.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWriteStep3.py
@@ -1,5 +1,6 @@
 # Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 from AthenaPoolTest.EventInfoReadWrite import eventInfoTestCfg
+import sys
 
-eventInfoTestCfg(3)
+sys.exit(eventInfoTestCfg(3))
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWriteStep4.py b/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWriteStep4.py
index 2f9222f89d24d4b0793d56d0968c465e869b86bd..9736e746212d2cac79a612f481241c9ac625f48f 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWriteStep4.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWriteStep4.py
@@ -1,5 +1,6 @@
 # Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 from AthenaPoolTest.EventInfoReadWrite import eventInfoTestCfg
+import sys
 
-eventInfoTestCfg(4)
+sys.exit(eventInfoTestCfg(4))
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWriteStep5.py b/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWriteStep5.py
index 6f6ab73bae9c4483e8457b377c3f3aa41c369e04..dba1aae6bd237994af209ca0c4d63409b1d7f6c6 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWriteStep5.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWriteStep5.py
@@ -1,5 +1,6 @@
 # Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
 
 from AthenaPoolTest.EventInfoReadWrite import eventInfoTestCfg
+import sys
 
-eventInfoTestCfg(5)
+sys.exit(eventInfoTestCfg(5))