diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/src/AlignableTransformCnv_p1.cxx b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/src/AlignableTransformCnv_p1.cxx
index e9041ed53f56f83fedffbbdbd31c8cf7b9b3e8e4..95b549bf59f12a4c0594a8edb0c3c64ad36298bc 100644
--- a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/src/AlignableTransformCnv_p1.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/src/AlignableTransformCnv_p1.cxx
@@ -54,7 +54,7 @@ void AlignableTransformCnv_p1::persToTrans(const AlignableTransform_p1* pers, Al
         log << MSG::ERROR << "AlignableTransformCnv_p1::persToTrans Incorrect size for transform info: number of ids: " 
             << pers->m_ids.size() << " Number of transform elements: " 
             << pers->m_trans.size() << " Should be 12*nids!! "
-            << endreq;
+            << endmsg;
     }
     for (unsigned int i = 0; i < pers->m_ids.size(); ++i) {
         Identifier     id(pers->m_ids[i]);
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/AlignableTransformCnv_p1_test.cxx b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/AlignableTransformCnv_p1_test.cxx
index 3b832cc71f675993505b25e5ac08047dd4367d91..b5439dac45c3d35dcb2562b2880d0623e476502c 100644
--- a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/AlignableTransformCnv_p1_test.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/AlignableTransformCnv_p1_test.cxx
@@ -12,6 +12,7 @@
 
 #undef NDEBUG
 #include "DetDescrCondTPCnv/AlignableTransformCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
 #include <iostream>
@@ -28,6 +29,7 @@ HepGeom::Transform3D makexform (float dx, float dy, float dz,
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
   MsgStream log (0, "test");
   AlignableTransform trans1 ("tag");
 
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetCondCFloatCnv_p1_test.cxx b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetCondCFloatCnv_p1_test.cxx
index 7094a97da0910a5c50ab00cf0d754de03e54bb16..28595c834a7e7adbe4b261773be8e8578ab45a51 100644
--- a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetCondCFloatCnv_p1_test.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetCondCFloatCnv_p1_test.cxx
@@ -12,6 +12,7 @@
 
 #undef NDEBUG
 #include "DetDescrCondTPCnv/DetCondCFloatCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
 #include <iostream>
@@ -20,6 +21,7 @@
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
   MsgStream log (0, "test");
   DetCondCFloat trans1 (3, "tag");
 
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetDescrCondIdentifier_old_cnv_test.cxx b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetDescrCondIdentifier_old_cnv_test.cxx
index c35c3dafce4676693e06bffa853ef00c57c75d59..52545b15ae5ff041a1948a423f0f793fd9fae738 100644
--- a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetDescrCondIdentifier_old_cnv_test.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetDescrCondIdentifier_old_cnv_test.cxx
@@ -12,6 +12,7 @@
 
 #undef NDEBUG
 #include "DetDescrCondTPCnv/DetDescrCondIdentifier_old_cnv.h"
+#include "TestTools/leakcheck.h"
 #include <cassert>
 #include <iostream>
 
@@ -20,6 +21,7 @@ void test1()
 {
   std::cout << "test1\n";
   DetDescrCondIdentifier_old_cnv cnv;
+  Athena_test::Leakcheck check;
 
   DetDescrCondIdentifier_old oldobj;
   oldobj.m_id = 1234;
diff --git a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetStatusMapCnv_p1_test.cxx b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetStatusMapCnv_p1_test.cxx
index 3707580538f20021ee8e8f9c39004aa69851c813..8cf894e889cb29ecb76e04175ae24503b749f816 100644
--- a/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetStatusMapCnv_p1_test.cxx
+++ b/DetectorDescription/DetDescrCond/DetDescrCondTPCnv/test/DetStatusMapCnv_p1_test.cxx
@@ -12,6 +12,7 @@
 
 #undef NDEBUG
 #include "DetDescrCondTPCnv/DetStatusMapCnv_p1.h"
+#include "TestTools/leakcheck.h"
 #include "GaudiKernel/MsgStream.h"
 #include <cassert>
 #include <iostream>
@@ -20,6 +21,7 @@
 void test1()
 {
   std::cout << "test1\n";
+  Athena_test::Leakcheck check;
   MsgStream log (0, "test");
   DetStatusMap trans1;
   trans1.add ("det1", DetStatus(10, 1.5, 2.5));