diff --git a/Control/PerformanceMonitoring/PerfMonTests/CMakeLists.txt b/Control/PerformanceMonitoring/PerfMonTests/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cd0b7cbf64ceee7f3b6d981bd4d127af8c6f0684
--- /dev/null
+++ b/Control/PerformanceMonitoring/PerfMonTests/CMakeLists.txt
@@ -0,0 +1,34 @@
+################################################################################
+# Package: PerfMonTests
+################################################################################
+
+# Declare the package name:
+atlas_subdir( PerfMonTests )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PRIVATE
+                          Control/AthenaBaseComps
+                          Control/AthenaKernel
+                          Control/DataModel
+                          Control/PerformanceMonitoring/PerfMonComps
+                          Control/PerformanceMonitoring/PerfMonKernel
+                          Control/SGTools
+                          Control/StoreGate
+                          GaudiKernel
+                          PhysicsAnalysis/TruthParticleID/McParticleTests
+                          Reconstruction/Jet/JetRec )
+
+# External dependencies:
+find_package( CLHEP )
+
+# Component(s) in the package:
+atlas_add_component( PerfMonTests
+                     src/*.cxx
+                     src/components/*.cxx
+                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
+                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel DataModel PerfMonKernel SGTools StoreGateLib SGtests GaudiKernel )
+
+# Install files from the package:
+atlas_install_python_modules( python/*.py )
+atlas_install_joboptions( share/*.py share/tests/*.py )
+
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/Hit.h b/Control/PerformanceMonitoring/PerfMonTests/src/Hit.h
index 3b4097731d979b7a6139698c43d3587260b38e2b..0bb7f9ba667e34a52efea0ef0631cf5f7f562ce8 100644
--- a/Control/PerformanceMonitoring/PerfMonTests/src/Hit.h
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/Hit.h
@@ -21,7 +21,7 @@ namespace PerfMonTest{
     DHit(double x, double y, unsigned int id) :
       IHit(), m_x(x), m_y(y), m_id(id) {}
     virtual unsigned int id() { return m_id; }
-  private:
+    //private:
     double m_x;
     double m_y;
     unsigned int m_id;    
@@ -36,7 +36,7 @@ namespace PerfMonTest{
     FHit(float x, float y, unsigned short id) :
       IHit(), m_x(x), m_y(y), m_id(id) {}
     virtual unsigned int id() { return m_id; }
-  private:
+    //private:
     float m_x;
     float m_y;
     unsigned short m_id;    
diff --git a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestPolyVectorAlgWithArenas.cxx b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestPolyVectorAlgWithArenas.cxx
index bf5a0d23161272fc2163e756c294c14ab92609e5..ddd779c709090b9f788a2d8ec0bf747b66646563 100644
--- a/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestPolyVectorAlgWithArenas.cxx
+++ b/Control/PerformanceMonitoring/PerfMonTests/src/PerfMonTestPolyVectorAlgWithArenas.cxx
@@ -55,8 +55,8 @@ StatusCode PolyVectorAlgWithArenas::finalize()
 
 StatusCode PolyVectorAlgWithArenas::execute()
 {  
-  static DataPool<DHit> dhitPool;
-  static DataPool<FHit> fhitPool;
+  DataPool<DHit> dhitPool;
+  DataPool<FHit> fhitPool;
   ATH_MSG_DEBUG("Executing ");
   HitPtrContainer vptr(SG::VIEW_ELEMENTS);  //<<< NEW
   vptr.reserve(m_2bReserved.value());