diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt b/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt
index b65bf59ba476e787c6e02ac7e275cf221529e4b5..2291a4a178b444ed1bdf072ce37d5271ef14666a 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/CMakeLists.txt
@@ -75,7 +75,7 @@ function (athenapooltest_run_test testName jo pattern)
   atlas_add_test( ${testName}
                   SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/athenapooltest_${testName}.sh
                   POST_EXEC_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/test/post_check_with_select.sh ${testName} ${pattern}"
-                  PROPERTIES TIMEOUT 600
+                  PROPERTIES TIMEOUT 900
                    )
   if( ARG_DEPENDS )
     set_tests_properties( AthenaPoolTest_${testName}_ctest
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2Write.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2Write.py
index 811371806965482f3f23c9441e684bc2ac68ad58..49b77ac4dd736909dec5242fbb27b79afd6ede95 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2Write.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestStep2Write.py
@@ -66,10 +66,10 @@ include( "AthenaPoolTestAthenaPool/AthenaPoolTestAthenaPoolItemList_joboptions.p
 print fullItemList
 
 from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-Stream1 = AthenaPoolOutputStream( "Stream1" )
+Stream1 = AthenaPoolOutputStream( "Stream1", noTag=True )
 
 # Run OutputStream as an algorithm
-topSequence += AthenaPoolOutputStream( "Stream1" )
+topSequence += AthenaPoolOutputStream( "Stream1", noTag=True )
 # Must make sure that no OutStream's have been declared
 theApp.OutStream     = []; 
 # Stream's output file
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWrite.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWrite.py
index acd82e7cea2ece0a3590e8d2aaa903dd3bd99bb7..6c2472465406e4b2f49461b9e8a6adce66d420c3 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWrite.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/AthenaPoolTestWrite.py
@@ -85,7 +85,7 @@ print fullItemList
 
 # Stream's output file
 from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-Stream1 = AthenaPoolOutputStream( "Stream1" )
+Stream1 = AthenaPoolOutputStream( "Stream1", noTag=True )
 Stream1.OutputFile =   "SimplePoolFile.root"
 # List of DO's to write out
 Stream1.ItemList   += fullItemList
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWrite.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWrite.py
index 2db82ee7759f58d79679b1e4638e7a6e6b9415c3..af7bd07c828aaf2211d6c15cfcd5dd915a84847a 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWrite.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWrite.py
@@ -112,7 +112,7 @@ print fullItemList
 
 # Stream's output file
 from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-Stream1 = AthenaPoolOutputStream( "Stream1", "SimplePoolFile.root", asAlg = True )
+Stream1 = AthenaPoolOutputStream( "Stream1", "SimplePoolFile.root", asAlg = True, noTag=True )
 # List of DO's to write out
 Stream1.ItemList   += fullItemList
 
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep2.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep2.py
index 143475d9b78cac57744256ba4b7361a82c677e70..77b67afa73b257a8cd63e638fffb1e0057b1b172 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep2.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep2.py
@@ -96,7 +96,7 @@ print fullItemList
 
 # Stream's output file - Run OutputStream as an algorithm
 from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-Stream1 = AthenaPoolOutputStream( "Stream1", "SimplePoolFile1.root", asAlg = True )
+Stream1 = AthenaPoolOutputStream( "Stream1", "SimplePoolFile1.root", asAlg = True, noTag=True )
 
 # List of DO's to write out
 Stream1.ItemList   += fullItemList
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep3.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep3.py
index 45a7d2a8e3d6d8579fc1ae7537080ce6414a20db..7fe552ff13c81f9100e68ee149570815e687ddae 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep3.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep3.py
@@ -91,7 +91,7 @@ print fullItemList
 
 # Run OutputStream as an algorithm
 from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-Stream1 = AthenaPoolOutputStream( "Stream1", "SimplePoolFile2.root", asAlg = True )
+Stream1 = AthenaPoolOutputStream( "Stream1", "SimplePoolFile2.root", asAlg = True, noTag=True )
 
 # List of DO's to write out
 Stream1.ItemList   += fullItemList
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep4.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep4.py
index fa1314e41c5b0dc98e1b4ec73a5d4730c5770370..45569cf151955013a1ecbe9cce49073b00cc57fe 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep4.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep4.py
@@ -91,7 +91,7 @@ print fullItemList
 
 # Run OutputStream as an algorithm
 from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-Stream1 = AthenaPoolOutputStream( "Stream1", "SimplePoolFile3.root", asAlg = True )
+Stream1 = AthenaPoolOutputStream( "Stream1", "SimplePoolFile3.root", asAlg = True, noTag=True )
 
 # List of DO's to write out
 Stream1.ItemList   += fullItemList
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep5.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep5.py
index 20af63ff13120863330d1b04cb1e0b44a2603926..94542999dd1ae2e4e4562746d4ab86d20c6554f7 100644
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep5.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/EventInfoWriteStep5.py
@@ -91,7 +91,7 @@ print fullItemList
 
 # Run OutputStream as an algorithm
 from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-Stream1 = AthenaPoolOutputStream( "Stream1", "SimplePoolFile4.root", asAlg = True )
+Stream1 = AthenaPoolOutputStream( "Stream1", "SimplePoolFile4.root", asAlg = True, noTag=True )
 
 # List of DO's to write out
 Stream1.ItemList   += fullItemList
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/InDetRawDataWriter_jobOptions.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/InDetRawDataWriter_jobOptions.py
index ca81d9d38e12d01b24c40fffcf9a9fa6786a726f..ede285c58c0a4182d0fcda02bf5c82b2295f83cd 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/InDetRawDataWriter_jobOptions.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/InDetRawDataWriter_jobOptions.py
@@ -83,7 +83,7 @@ svcMgr.AthenaSealSvc.CheckDictionary = True
 
 # Stream's output file
 from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-Stream1 = AthenaPoolOutputStream( "Stream1" )
+Stream1 = AthenaPoolOutputStream( "Stream1", noTag=True )
 Stream1.OutputFile =   "SimplePoolFile.root"
 # List of DO's to write out
 Stream1.ItemList+=["PixelRDO_Container#*"]
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptions.py b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptions.py
index 5275546918e917ebbac2ef32a5bfff37cd0b1f6b..b25d301f8528a8c6c267a51cca76dd55eb0bf8ec 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptions.py
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/share/LArCellContWriter_jobOptions.py
@@ -79,7 +79,7 @@ svcMgr.AthenaSealSvc.CheckDictionary = True
 
 # Stream's output file
 from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-Stream1 = AthenaPoolOutputStream( "Stream1" )
+Stream1 = AthenaPoolOutputStream( "Stream1", noTag=True )
 Stream1.OutputFile =   "SimplePoolFile.root"
 # List of DO's to write out
 Stream1.ItemList+=["CaloCellContainer#*"]