diff --git a/AtlasTest/AthenaMPTest/CMakeLists.txt b/AtlasTest/AthenaMPTest/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..023bab7b9950daf731e1fef4375e98e44e1f8d39
--- /dev/null
+++ b/AtlasTest/AthenaMPTest/CMakeLists.txt
@@ -0,0 +1,12 @@
+################################################################################
+# Package: AthenaMPTest
+################################################################################
+
+# Declare the package name:
+atlas_subdir( AthenaMPTest )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          AtlasTest/TestTools
+                          TestPolicy )
+
diff --git a/AtlasTest/AthenaMPTest/test/AthenaMP_ConfigurationTest.xml b/AtlasTest/AthenaMPTest/test/AthenaMP_ConfigurationTest.xml
index 350c615221ffcc8347d8c9e738a44b6fbcddcf17..3cab90a80fc5ee36a33071f34c66428ac4d4a0cc 100644
--- a/AtlasTest/AthenaMPTest/test/AthenaMP_ConfigurationTest.xml
+++ b/AtlasTest/AthenaMPTest/test/AthenaMP_ConfigurationTest.xml
@@ -2,20 +2,6 @@
 
 <unifiedTestConfiguration>
     <atn>
-        <TEST name="PreCountedEvents" type="athena" suite="athenamp">
-            <package_atn>AtlasTest/AthenaMPTest</package_atn>
-            <options_atn>--nprocs=2 -c "jp.AthenaCommonFlags.EvtMax=8; from AthenaMP.AthenaMPFlags import jobproperties as jps; jps.AthenaMPFlags.PreCountedEvents=6; jps.AthenaMPFlags.CollectSubprocessLogs=True" RecExRecoTest/RecExRecoTest_RTT_id.py</options_atn>
-            <timelimit>30</timelimit>
-            <author> Vakho Tsulaia </author>
-            <mailto> tsulaia@cern.ch </mailto>
-            <prescript>RecExCommon_links.sh</prescript>
-            <expectations>
-                <errorMessage>FAILURE (ERROR)</errorMessage>
-                <successMessage>"successful run"</successMessage>
-                <returnValue>0</returnValue>
-            </expectations>
-        </TEST>
-        
         <TEST name="WorkerTopDir" type="athena" suite="athenamp">
             <package_atn>AtlasTest/AthenaMPTest</package_atn>
             <options_atn>--nprocs=2 -c "jp.AthenaCommonFlags.EvtMax=8; from AthenaMP.AthenaMPFlags import jobproperties as jps; jps.AthenaMPFlags.WorkerTopDir='MPWorkers'; jps.AthenaMPFlags.CollectSubprocessLogs=True" RecExRecoTest/RecExRecoTest_RTT_id.py</options_atn>
diff --git a/AtlasTest/AthenaMPTest/test/AthenaMP_Reco_trf_Test.xml b/AtlasTest/AthenaMPTest/test/AthenaMP_Reco_trf_Test.xml
index ed093f3643b07f79a07ebf4fd1e6df8910b63de3..ab903cd9087db93750352dad4c32503d7161d5ce 100644
--- a/AtlasTest/AthenaMPTest/test/AthenaMP_Reco_trf_Test.xml
+++ b/AtlasTest/AthenaMPTest/test/AthenaMP_Reco_trf_Test.xml
@@ -17,7 +17,7 @@
         
         <TEST name="SharedPoolReader" type="script" suite="athenamp">
             <package_atn>AtlasTest/AthenaMPTest</package_atn>
-	    <options_atn>TRF_ECHO=1 Reco_tf.py '--athenaopts=--nprocs=2' '--inputRDOFile' '/afs/cern.ch/atlas/project/rig/referencefiles/MC/valid1.105200.T1_McAtNlo_Jimmy.digit.RDO.e835_s1256_s1258_d566_tid464353_00/RDO.464353._000001.pool.root.1' '--outputESDFile' 'ESD.pool.root' '--autoConfiguration' 'everything' '--maxEvents=4' '--preExec' 'from AthenaMP.AthenaMPFlags import jobproperties as jps' 'jps.AthenaMPFlags.CollectSubprocessLogs=True' 'jps.AthenaMPFlags.Strategy="SharedReader"'</options_atn>
+	    <options_atn>TRF_ECHO=1 Reco_tf.py '--athenaopts=--nprocs=2' '--inputRDOFile' '/afs/cern.ch/atlas/project/rig/referencefiles/MC/valid1.105200.T1_McAtNlo_Jimmy.digit.RDO.e835_s1256_s1258_d566_tid464353_00/RDO.464353._000001.pool.root.1' '--outputESDFile' 'ESD.pool.root' '--autoConfiguration' 'everything' '--maxEvents=4' '--preExec' 'from AthenaMP.AthenaMPFlags import jobproperties as jps' 'jps.AthenaMPFlags.CollectSubprocessLogs=True' 'jps.AthenaMPFlags.Strategy="SharedReader"' 'rec.doTrigger=False'</options_atn>
             <timelimit>90</timelimit>
             <author> Vakho Tsulaia </author>
             <mailto> tsulaia@cern.ch  </mailto>
diff --git a/AtlasTest/AthenaMPTest/test/AthenaMP_SimulationTest.xml b/AtlasTest/AthenaMPTest/test/AthenaMP_SimulationTest.xml
index e9d59261c1cb6638ddc5d5f8c6c144a36f93b4ee..2c50dcf53b38c1632270a5203860fbbf6b56a20a 100644
--- a/AtlasTest/AthenaMPTest/test/AthenaMP_SimulationTest.xml
+++ b/AtlasTest/AthenaMPTest/test/AthenaMP_SimulationTest.xml
@@ -4,7 +4,7 @@
 
     <TEST name="G4AtlasMP" type="athena" suite="AthenaMPSim">
       <doc>Tests standard simu job</doc>
-      <options_atn>--nprocs=2 -c "from AthenaMP.AthenaMPFlags import jobproperties as jps; jps.AthenaMPFlags.PreCountedEvents=4; jps.AthenaMPFlags.CollectSubprocessLogs=True" G4AtlasApps/jobOptions.G4Atlas.py</options_atn>
+      <options_atn>--nprocs=2 -c "from AthenaMP.AthenaMPFlags import jobproperties as jps; jps.AthenaMPFlags.CollectSubprocessLogs=True" G4AtlasApps/jobOptions.G4Atlas.py</options_atn>
       <timelimit>30</timelimit>
       <author> Vakho Tsulaia </author>
       <mailto> tsulaia@cern.ch</mailto>