diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/src/AthenaPoolTestDataWriter.cxx b/AtlasTest/DatabaseTest/AthenaPoolTest/src/AthenaPoolTestDataWriter.cxx
index bb108884ad98116721ab21c764d8f0afa96da0af..cd9489049d1bff1080584aa376fe13b4f43b4ab3 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/src/AthenaPoolTestDataWriter.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/src/AthenaPoolTestDataWriter.cxx
@@ -519,7 +519,7 @@ StatusCode AthenaPoolTestDataWriter::execute()
 
     PileUpEventInfo* pOverEvent = new PileUpEventInfo(pOvrID, pOvrEt, triggerInfo);
     //  register as sub event of the overlaid
-    const EventInfo * newEvt = new EventInfo(*evt);
+    auto newEvt = std::make_unique<EventInfo>(*evt);
 
     // get StoreGate service
     // StoreGateSvc* storeGate;
@@ -528,7 +528,7 @@ StatusCode AthenaPoolTestDataWriter::execute()
     //     return StatusCode::FAILURE;
     // } 
     // pOverEvent->addSubEvt(25, PileUpTimeEventIndex::MinimumBias, newEvt, storeGate);
-    pOverEvent->addSubEvt(25, PileUpTimeEventIndex::MinimumBias, newEvt, 0);
+    pOverEvent->addSubEvt(25, PileUpTimeEventIndex::MinimumBias, std::move(newEvt), 0);
     ATH_CHECK( evtStore()->record(pOverEvent, "OverlayEvent") );
 
     // Printout
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/src/EventInfoReader.cxx b/AtlasTest/DatabaseTest/AthenaPoolTest/src/EventInfoReader.cxx
index d5780839b1159b6137bf0619098716469be7c2b5..be979240aaa88c618b662be4e910aadbc15e2259 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/src/EventInfoReader.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/src/EventInfoReader.cxx
@@ -70,11 +70,12 @@ StatusCode EventInfoReader::execute()
 
     // Get TagInfo and add tags
 
+    TagInfo tagInfo_local;
     const TagInfo* tagInfo = 0;
     // Try to get tagInfo if there, otherwise create
     if (detStore()->retrieve( tagInfo ).isFailure()) {
 	ATH_MSG_DEBUG("No TagInfo in DetectorStore - creating one" );
-	tagInfo = new TagInfo();
+	tagInfo = &tagInfo_local;
     } 
     else {
 	ATH_MSG_DEBUG("Retrieved TagInfo" );
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTest/src/EventInfoWriter.cxx b/AtlasTest/DatabaseTest/AthenaPoolTest/src/EventInfoWriter.cxx
index bdee6ff36558d60de59c4253aec8f2fec8cbe35a..b05d2456743b8d3f7a74c11e4ebafb66846d438f 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTest/src/EventInfoWriter.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolTest/src/EventInfoWriter.cxx
@@ -158,11 +158,12 @@ ATH_MSG_DEBUG("execute: reset TagInfo proxy");
 
     // Get TagInfo and add tags
 
+    TagInfo tagInfo_local;
     const TagInfo* tagInfo = 0;
     // Try to get tagInfo if there, otherwise create
     if (detStore()->retrieve( tagInfo ).isFailure()) {
 	ATH_MSG_DEBUG("No TagInfo in DetectorStore - creating one");
-	tagInfo = new TagInfo();
+	tagInfo = &tagInfo_local;
     } 
     else {
 	ATH_MSG_DEBUG("Retrieved TagInfo");