diff --git a/Simulation/G4Atlas/G4AtlasApps/test/test_AtlasG4_cosmics_configuration.py b/Simulation/G4Atlas/G4AtlasApps/test/test_AtlasG4_cosmics_configuration.py
index f4fdf09cfe368c2417b3b9d51c0609e800f9ff16..bc8b98324dd334359fe98d2db6eb9b4058a07e7b 100755
--- a/Simulation/G4Atlas/G4AtlasApps/test/test_AtlasG4_cosmics_configuration.py
+++ b/Simulation/G4Atlas/G4AtlasApps/test/test_AtlasG4_cosmics_configuration.py
@@ -113,7 +113,7 @@ class TestAtlasG4Cosmics(unittest.TestCase):
         ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members']
         # need to evaluate to obtain actual Python object
         ath_alg_seqence_list = eval(ath_alg_seqence_as_str)
-        actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[0]
+        actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[1] # xAODMaker::EventInfoCnvAlg/xAODMaker::EventInfoCnvAlg is in position 0 in master now.
         expected_last_ath_alg_sequence_entry = "CosmicGenerator/CosmicGenerator"
         self.assertEqual(expected_last_ath_alg_sequence_entry,
                          actual_last_ath_alg_sequence_entry)
@@ -198,7 +198,7 @@ class TestAtlasG4Cosmics(unittest.TestCase):
         ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members']
         # need to evaluate to obtain actual Python object
         ath_alg_seqence_list = eval(ath_alg_seqence_as_str)
-        actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[2] # Position 1 is the Sim Timer Alg
+        actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[3] # Position 1 is the Sim Timer Alg, xAODMaker::EventInfoCnvAlg/xAODMaker::EventInfoCnvAlg is in position 0 in master now
         expected_last_ath_alg_sequence_entry = "Simulation::BeamEffectsAlg/BeamEffectsAlg"
         self.assertEqual(expected_last_ath_alg_sequence_entry,
                          actual_last_ath_alg_sequence_entry)
diff --git a/Simulation/G4Atlas/G4AtlasApps/test/test_G4Atlas.sh b/Simulation/G4Atlas/G4AtlasApps/test/test_G4Atlas.sh
index a46d2275ac5a4cf00ec903b1fab7ea77d7cf2794..d269fdfe37401c30fa22f6af3a38de4c8a44236f 100755
--- a/Simulation/G4Atlas/G4AtlasApps/test/test_G4Atlas.sh
+++ b/Simulation/G4Atlas/G4AtlasApps/test/test_G4Atlas.sh
@@ -7,7 +7,6 @@
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
 # art-include: master/Athena
-# art-include: master/AthSimulation
 
 athena G4AtlasApps/jobOptions.G4Atlas.py
 
diff --git a/Simulation/G4Atlas/G4AtlasApps/test/test_G4Cosmic.sh b/Simulation/G4Atlas/G4AtlasApps/test/test_G4Cosmic.sh
index 4b2fe0133bff59c3ec81748838a784b180db9301..d99e6f2f92c1a90eda31b40e873f28c8090f7b2c 100755
--- a/Simulation/G4Atlas/G4AtlasApps/test/test_G4Cosmic.sh
+++ b/Simulation/G4Atlas/G4AtlasApps/test/test_G4Cosmic.sh
@@ -7,7 +7,6 @@
 # art-include: 21.3/Athena
 # art-include: 21.9/Athena
 # art-include: master/Athena
-# art-include: master/AthSimulation
 
 athena G4AtlasApps/jobOptions.G4Cosmic.py
 
diff --git a/Simulation/G4Atlas/G4AtlasApps/test/test_TestBeam_tf_configuration.py b/Simulation/G4Atlas/G4AtlasApps/test/test_TestBeam_tf_configuration.py
index 80cc35496f11003be58653e72acdca4cc42513cf..af6d85d9ebcac16e2a1ae5ffaac84aedcb21f127 100755
--- a/Simulation/G4Atlas/G4AtlasApps/test/test_TestBeam_tf_configuration.py
+++ b/Simulation/G4Atlas/G4AtlasApps/test/test_TestBeam_tf_configuration.py
@@ -107,7 +107,7 @@ class TestTestBeam(unittest.TestCase):
         ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members']
         # need to evaluate to obtain actual Python object
         ath_alg_seqence_list = eval(ath_alg_seqence_as_str)
-        actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[0]
+        actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[1] # xAODMaker::EventInfoCnvAlg/xAODMaker::EventInfoCnvAlg is in position 0 in master now
         expected_last_ath_alg_sequence_entry = "PyAthena::Alg/ParticleGun"
         self.assertEqual(expected_last_ath_alg_sequence_entry,
                          actual_last_ath_alg_sequence_entry)
@@ -117,7 +117,7 @@ class TestTestBeam(unittest.TestCase):
         ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members']
         # need to evaluate to obtain actual Python object
         ath_alg_seqence_list = eval(ath_alg_seqence_as_str)
-        actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[1]
+        actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[2] # xAODMaker::EventInfoCnvAlg/xAODMaker::EventInfoCnvAlg is in position 0 in master now
         expected_last_ath_alg_sequence_entry = "CopyEventWeight/CopyEventWeight"
         self.assertEqual(expected_last_ath_alg_sequence_entry,
                          actual_last_ath_alg_sequence_entry)
@@ -127,7 +127,7 @@ class TestTestBeam(unittest.TestCase):
         ath_alg_seqence_as_str = self._job_config_dict['AthAlgSeq']['Members']
         # need to evaluate to obtain actual Python object
         ath_alg_seqence_list = eval(ath_alg_seqence_as_str)
-        actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[2]
+        actual_last_ath_alg_sequence_entry = ath_alg_seqence_list[3] # xAODMaker::EventInfoCnvAlg/xAODMaker::EventInfoCnvAlg is in position 0 in master now
         expected_last_ath_alg_sequence_entry = "Simulation::BeamEffectsAlg/BeamEffectsAlg"
         self.assertEqual(expected_last_ath_alg_sequence_entry,
                          actual_last_ath_alg_sequence_entry)