diff --git a/Simulation/Tests/SimCoreTests/CMakeLists.txt b/Simulation/Tests/SimCoreTests/CMakeLists.txt
index fbb9f7fe5dad567ea2d64a4e3e842fbb08e1a0f6..48c2030a672ad7041c46d84cb314c46b1392d513 100644
--- a/Simulation/Tests/SimCoreTests/CMakeLists.txt
+++ b/Simulation/Tests/SimCoreTests/CMakeLists.txt
@@ -11,4 +11,4 @@ atlas_depends_on_subdirs( PRIVATE
 
 # Install files from the package:
 atlas_install_runtime( test/SimCoreTests_TestConfiguration.xml )
-
+atlas_install_scripts( test/*.sh test/*.py )
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2010GeomSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2010GeomSim.sh
new file mode 100755
index 0000000000000000000000000000000000000000..210477f683f0553250d1c4c0d9fd35ff80d76c80
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2010GeomSim.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# art-description: Run simulation outside ISF, using 2010 geometry and conditions, reading single muon events, writing HITS
+# art-type: grid
+
+#FIXME need to copy input file to CVMFS
+AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/mu_E200_eta0-25.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '10' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R1-2010-02-00-00' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '155697' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2011GeomSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2011GeomSim.sh
new file mode 100755
index 0000000000000000000000000000000000000000..b18122608612ea91ccf5eef4e6e04a14200b2a49
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2011GeomSim.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# art-description: Run simulation outside ISF, using 2011 geometry and conditions, reading single muon events, writing HITS
+# art-type: grid
+
+#FIXME need to copy input file to CVMFS
+AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/mu_E200_eta0-25.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '10' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R1-2011-02-00-00' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '180164' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2012GeomSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2012GeomSim.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ae7d0290f3f234db8180acfaaae31caf917cc24b
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_2012GeomSim.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# art-description: Run simulation outside ISF, using 2012 geometry and conditions, reading single muon events, writing HITS
+# art-type: grid
+
+#FIXME need to copy input file to CVMFS
+AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/mu_E200_eta0-25.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '10' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R1-2012-03-00-00' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '212272' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_AFPSimTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_AFPSimTest.sh
new file mode 100755
index 0000000000000000000000000000000000000000..d8b007d972938e49bad6de80185af9e376f94579
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_AFPSimTest.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# art-description: Tests ATLAS + AFP simulation, generating events on-the-fly
+# art-type: grid
+
+# FIXME need an AFP-specific single particle generator configuration
+AtlasG4_tf.py --preInclude 'G4AtlasTests/preInclude.ALFA_SingleParticle.py' --outputHITSFile 'test.HITS.pool.root' --maxEvents '3' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --AFPOn 'True' --postInclude 'PyJobTransforms/UseFrontier.py'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references and run DCube
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ALFASimTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ALFASimTest.sh
new file mode 100755
index 0000000000000000000000000000000000000000..14bd2a1dd18d76aa1128fc72a3affa27eb545029
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ALFASimTest.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# art-description: Tests ATLAS + ALFA simulation, generating events on-the-fly
+# art-type: grid
+
+AtlasG4_tf.py --preInclude 'G4AtlasTests/preInclude.ALFA_SingleParticle.py' --outputHITSFile 'test.HITS.pool.root' --maxEvents '3' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --ALFAOn 'True' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.ALFA_dcube.py'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references and run DCube
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR.sh
new file mode 100755
index 0000000000000000000000000000000000000000..43040b3bc11b6c9bf539bad9c1c1ca2ff8d9fa15
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_EVNT2TR.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# art-description: Run simulation outside ISF, reading min bias events, write cavern background track records, using 2015 geometry and conditions
+# art-type: grid
+
+#FIXME need to copy input file to CVMFS
+AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/minbias_Inelastic_low-pythia8-7000.evgen.pool.root' --outputHITSFile 'discard.HITS.pool.root' --outputEVNT_CAVERNTRFile 'test.EVNT.pool.root' --maxEvents '2' --skipEvents '0' --randomSeed '5678' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'QGSP_BERT_HP' --postInclude 'PyJobTransforms/UseFrontier.py'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.EVNT.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_TR2HITS.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_TR2HITS.sh
new file mode 100755
index 0000000000000000000000000000000000000000..919e39be7b6d4b73540141d471199b6ae7683b2b
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CavernBg_TR2HITS.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# art-description: Run simulation outside ISF, reading cavern background track records, writing cavern background HITS, using 2015 geometry and conditions
+# art-type: grid
+
+#FIXME need to copy input file to CVMFS
+AtlasG4_tf.py --inputEVNT_CAVERNFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/cavernbg-pythia8-7000.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '5' --skipEvents '0' --randomSeed '8765' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'QGSP_BERT_HP' --postInclude 'PyJobTransforms/UseFrontier.py'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim.sh
new file mode 100755
index 0000000000000000000000000000000000000000..dc690fb9bac707c6932b3e9eea82b6653f772f21
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSim.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# art-description: Run cosmics simulation outside ISF, generating events on-the-fly, using 2015 geometry and conditions
+# art-type: grid
+
+AtlasG4_tf.py --outputHITSFile 'test.HITS.pool.root' --maxEvents '1500' --randomSeed '1234' --DataRunNumber '222525' --CosmicFilterVolume 'Calo' --CosmicFilterVolume2 'NONE' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --CosmicPtSlice 'NONE' --outputEVNT_COSMICSTRFile 'test.TR.pool.root' --beamType 'cosmics' --postInclude 'PyJobTransforms/UseFrontier.py'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root test.TR.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR.sh
new file mode 100755
index 0000000000000000000000000000000000000000..5bde0882d5dd38104b13b5b0bfbc8ebe34fcb487
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_CosmicSimTR.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# art-description: Run cosmics simulation outside ISF, using TrackRecords as input, using 2015 geometry and conditions
+# art-type: grid
+
+#FIXME need to copy input file to CVMFS
+AtlasG4_tf.py --inputEVNT_COSMICSFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/Cosmics.TR.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '-1' --randomSeed '1234' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --physicsList 'FTFP_BERT' --DataRunNumber '222525' --firstEvent '0' --beamType 'cosmics' --postInclude 'PyJobTransforms/UseFrontier.py'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FrozenShowerFCalOnly.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FrozenShowerFCalOnly.sh
new file mode 100755
index 0000000000000000000000000000000000000000..8bc5a367d6d070c88eb59d3c7515812f13e350d6
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FrozenShowerFCalOnly.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# art-description: Run simulation outside ISF, using Frozen Showers to speed up FCAL simulation, using 2015 geometry and conditions
+# art-type: grid
+
+#FIXME need to copy input file to CVMFS
+AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/17.2.X/17.2.6.2/e_E50_eta34_49.EVNT.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents 10 --skipEvents 0 --randomSeed 10 --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --preInclude 'SimulationJobOptions/preInclude.FrozenShowersFCalOnly.py' --postInclude 'PyJobTransforms/UseFrontier.py'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FtfpBertAtlTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FtfpBertAtlTest.sh
new file mode 100755
index 0000000000000000000000000000000000000000..a8ee22003ede31cdac9b1cb6b5fd1d4de3ddc061
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_FtfpBertAtlTest.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# art-description: Run simulation outside ISF, reading di-jet events, using FTFP_BERT_ATL physics list, writing HITS, using 2015 geometry and conditions
+# art-type: grid
+
+#FIXME need to copy input file to CVMFS
+AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/J2_jetjet-pythia6-7000.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '5' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT_ATL' --postInclude 'PyJobTransforms/UseFrontier.py'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_HeavyIonSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_HeavyIonSim.sh
new file mode 100755
index 0000000000000000000000000000000000000000..3db5f539eab3c9a1132d88fb27f0b0fefc135110
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_HeavyIonSim.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# art-description: Run simulation outside ISF, reading lead ions peripheral simulation (low multiplicity) events, writing HITS, using 2015 geometry and conditions
+# art-type: grid
+
+#FIXME need to copy input file to CVMFS
+AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/pbpb_Peripheral-hijing-5500.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '1' --skipEvents '4' --randomSeed '10' --geometryVersion 'ATLAS-R1-2012-03-00-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '210184' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:SimulationJobOptions/postInclude.HijingPars.py'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_LucidSimTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_LucidSimTest.sh
new file mode 100755
index 0000000000000000000000000000000000000000..0df4df59ca7cd2502d4e0916fa5d9fdc89d7e95a
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_LucidSimTest.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# art-description: Tests ATLAS + Lucid simulation, reading in events from a file, using 2015 geometry and conditions
+# art-type: grid
+
+# TODO copy input to CVMFS
+AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/minbias_Inelastic-pythia8-7000.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '3' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --LucidOn 'True' --postInclude 'PyJobTransforms/UseFrontier.py'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references and run DCube
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NSWSimTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NSWSimTest.sh
new file mode 100755
index 0000000000000000000000000000000000000000..2c2dc1114edb405fdf7a1ac70b35aab24603a128
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NSWSimTest.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# art-description: Tests NSW detector functionality using di-muon events, generating events on-the-fly
+# art-type: grid
+
+AtlasG4_tf.py --preInclude 'G4AtlasTests/ParticleGun_flatpt_2particle.py' --outputHITSFile 'test.HITS.pool.root' --maxEvents '200' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00' --conditionsTag 'OFLCOND-RUN12-SDR-25' --physicsList 'FTFP_BERT' --DBRelease 'current' --postInclude 'G4AtlasTests/postInclude.DCubeTest.py,G4AtlasTests/postInclude.NSW.config.simu.py' --preExec 'simFlags.ReleaseGeoModel=False;simFlags.SimulateNewSmallWheel=True;'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references and run DCube
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
+
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NeutronCutTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NeutronCutTest.sh
new file mode 100755
index 0000000000000000000000000000000000000000..c29bbc5582d17cc0cd5b1969c060f275be969898
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_NeutronCutTest.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# art-description: Run simulation outside ISF, reading Z->tau tau events, modifying the Neutron timing cut, writing HITS, using 2015 geometry and conditions
+# art-type: grid
+
+#FIXME need to copy input file to CVMFS
+AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/A3_Ztautau_filter-pythia6-7000.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '5' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --preInclude 'SimulationJobOptions/preInclude.G4SignalCavern.py' --postInclude 'PyJobTransforms/UseFrontier.py'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_QgsBicTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_QgsBicTest.sh
new file mode 100755
index 0000000000000000000000000000000000000000..5aa02d719da40deeb1057484832854cc25620991
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_QgsBicTest.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# art-description: Run simulation outside ISF, with alternative QGS_BIC physics list, reading in SU3 SUSY events, using 2015 geometry and conditions
+# art-type: grid
+
+#FIXME need to copy input file to CVMFS
+AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/susy_SU3-herwigpp-7000.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '5' --skipEvents '0' --randomSeed '42' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'QGSP_BIC' --postInclude 'PyJobTransforms/UseFrontier.py'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_SkipEventsTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_SkipEventsTest.sh
new file mode 100755
index 0000000000000000000000000000000000000000..4fffbc32942a13c9714ea7c293e671f24870e511
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_SkipEventsTest.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# art-description: Reading single particle gen events, checking that the SkipEvents argument works, using 2015 geometry and conditions
+# art-type: grid
+
+AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/e_E50_eta0-25.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '10' --skipEvents '5' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py'
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO Here we also want to be able to grep the log file for:
+#<fileGrepperPattern>skipping event 1.*skipping event 2.*skipping event 3.*skipping event 4.*skipping event 5</fileGrepperPattern>
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TTbarSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TTbarSim.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f709d97b914f5634e93c2f9ac51a877e1599ac29
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TTbarSim.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# art-description: Run simulation outside ISF, reading ttbar events, writing HITS, using 2015 geometry and conditions
+# art-type: grid
+
+#FIXME need to copy input file to CVMFS
+AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/ttbar_muplusjets-pythia6-7000.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '4' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' --preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TimingTest_TTbarSim.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TimingTest_TTbarSim.sh
new file mode 100755
index 0000000000000000000000000000000000000000..e499231940ba69e6a5183d2bd71e5979e34f61c5
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_TimingTest_TTbarSim.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# art-description: Run simulation outside ISF, reading ttbar events, switching on extra timing checks, writing HITS, using 2015 geometry and conditions
+# art-type: grid
+
+#FIXME need to copy input file to CVMFS
+AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/ttbar_muplusjets-pythia6-7000.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '10' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:LArG4FastSimulation/LArG4FastSimulation_setupTimer_jobOptions.py'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO Need to run DCube on timing histograms
+#art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_WriteCalHitsTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_WriteCalHitsTest.sh
new file mode 100755
index 0000000000000000000000000000000000000000..1c9907d7a675d16180c77522e712f31090c17ed6
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_WriteCalHitsTest.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# art-description: Reading in single particle gen events, writing out full CaloCalibrationHit information, using 2015 geometry and conditions
+# art-type: grid
+
+#TODO Need to copy input file to CVMFS
+AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/pi_E50_eta0-60.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '10' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --preInclude 'SimulationJobOptions/preInclude.CalHits.py,SimulationJobOptions/preInclude.ParticleID.py' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest_CaloCalibHits.py' --preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;'
+
+#TODO This is a regression test I think. We would also need to compare these files to fixed references and run DCube
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ZDCSimTest.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ZDCSimTest.sh
new file mode 100755
index 0000000000000000000000000000000000000000..ad92cc6c1d4e0274a6d0870e309bddfe40eac66d
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_ZDCSimTest.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# art-description: Tests ATLAS + ZDC simulation, generating events on-the-fly
+# art-type: grid
+
+AtlasG4_tf.py --preInclude 'G4AtlasTests/preInclude.ZDC_SingleParticle.py' --outputHITSFile 'test.HITS.pool.root' --maxEvents 3 --randomSeed 10 --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --ZDCOn 'True' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.ZDC_dcube.py'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references and run DCube
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_electrons.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_electrons.sh
new file mode 100755
index 0000000000000000000000000000000000000000..91869e7eb22a46de18ade1e498b6052b91d406ca
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_electrons.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# art-description: Tests detector response to single electrons, generated on-the-fly, using 2015 geometry and conditions
+# art-type: grid
+
+AtlasG4_tf.py --preInclude 'SimulationJobOptions/preInclude.SingleElectronGenerator.py' --outputHITSFile 'test.HITS.pool.root' --maxEvents '1000' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' --preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references and run DCube
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
+
+# TODO Remake plots by reading in the HITS file produced by the previous job (Tests TP conversion) - need to run DCube on output
+# athena G4AtlasTests/test_AtlasG4_electrons_noevgen.py
+
+
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_minbias.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_minbias.sh
new file mode 100755
index 0000000000000000000000000000000000000000..184196ba952258c12ce475424a25ff5b0934c64d
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_minbias.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# art-description: Tests inner detector response to minbias events, using 2015 geometry and conditions
+# art-type: grid
+
+#TODO need to copy input file to CVMFS
+AtlasG4_tf.py --inputEVNTFile '/afs/cern.ch/atlas/offline/ProdData/16.6.X/16.6.7.Y/minbias_Inelastic-pythia8-7000.evgen.pool.root' --outputHITSFile 'test.HITS.pool.root' --maxEvents '50' --skipEvents '0' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --preInclude 'SimulationJobOptions/preInclude.CaloOffDigitConfig.py,SimulationJobOptions/preInclude.MuonOffDigitConfig.py' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' --preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;'
+# TODO would be good to update preExec syntax to apply beam rotations
+#'simFlags.EventFilter.set_On();simFlags.EventFilter.get_Value()["BeamEffectTransformation"]=True;'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references and run DCube
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_muons.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_muons.sh
new file mode 100755
index 0000000000000000000000000000000000000000..7fe3bca50c00fd8303b07e0431f223a9db8eb72b
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_muons.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# art-description: Tests detector response to single muons, generated on-the-fly, using 2015 geometry and conditions
+# art-type: grid
+
+AtlasG4_tf.py --preInclude 'SimulationJobOptions/preInclude.SingleMuonGenerator.py' --outputHITSFile 'test.HITS.pool.root' --maxEvents '2000' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' --preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references and run DCube
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
+
+# TODO Remake plots by reading in the HITS file produced by the previous job (Tests TP conversion) - need to run DCube on output
+# athena G4AtlasTests/test_AtlasG4_muons_noevgen.py
+
+
diff --git a/Simulation/Tests/SimCoreTests/test/test_AtlasG4_pions.sh b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_pions.sh
new file mode 100755
index 0000000000000000000000000000000000000000..9b256a52463cc4e84ea70cacaf9d9d7db48806ad
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_AtlasG4_pions.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# art-description: Tests detector response to single pions, generated on-the-fly, using 2015 geometry and conditions
+# art-type: grid
+
+AtlasG4_tf.py --preInclude 'SimulationJobOptions/preInclude.SinglePionGenerator.py' --outputHITSFile 'test.HITS.pool.root' --maxEvents '150' --randomSeed '10' --geometryVersion 'ATLAS-R2-2015-03-01-00_VALIDATION' --conditionsTag 'OFLCOND-RUN12-SDR-19' --DataRunNumber '222525' --physicsList 'FTFP_BERT' --postInclude 'PyJobTransforms/UseFrontier.py' 'AtlasG4Tf:G4AtlasTests/postInclude.DCubeTest.py' --preExec 'AtlasG4Tf:simFlags.ReleaseGeoModel=False;'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references and run DCube
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_TestBeamSim.sh b/Simulation/Tests/SimCoreTests/test/test_TestBeamSim.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f88a56ed786e62f5d0013929cd8d20c64b843ddc
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_TestBeamSim.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# art-description: Run test-beam simulation outside ISF, generating events on-the-fly, writing HITS
+# art-type: grid
+
+#FIXME need to copy input file to CVMFS
+TestBeam_tf.py --outputHITSFile 'test.HITS.pool.root' --maxEvents '10' --Eta '0.35' --testBeamConfig 'tbtile' --postInclude 'PyJobTransforms/UseFrontier.py'
+
+SCRIPT_DIRECTORY=$1
+PACKAGE=$2
+TYPE=$3
+TEST_NAME=$4
+NIGHTLY_RELEASE=$5
+PROJECT=$6
+PLATFORM=$7
+NIGHTLY_TAG=$8
+
+# TODO This is a regression test I think. We would also need to compare these files to fixed references
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasCosmic.sh b/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasCosmic.sh
new file mode 100755
index 0000000000000000000000000000000000000000..8a9cfb321582447db81c1c5cc4820918e880e6b7
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasCosmic.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+# art-description: Run cosmics simulation outside ISF from the athena command-line, generating events on-the-fly
+# art-type: grid
+
+athena --preloadlib=${ATLASMKLLIBDIR_PRELOAD}/libintlc.so.5:${ATLASMKLLIBDIR_PRELOAD}/libimf.so G4AtlasApps/jobOptions.G4Cosmic.py
+
+# TODO This is a regression test I think. 
+art.py compare grid $NIGHTLY_RELEASE $PROJECT $PLATFORM $NIGHTLY_TAG $PACKAGE $TEST_NAME test.HITS.pool.root
diff --git a/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasGeoTest.sh b/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasGeoTest.sh
new file mode 100755
index 0000000000000000000000000000000000000000..b534af9ea9af31b0d00d5374b923d87aa2ff5145
--- /dev/null
+++ b/Simulation/Tests/SimCoreTests/test/test_athena_G4AtlasGeoTest.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# art-description: Recursive geometry test on ATLAS-R2-2015-03-01-00 (MC15 default). Done only on G4 and GeoModel envelopes
+# art-type: grid
+
+athena G4AtlasTests/test_G4AtlasGeo.py
+
+#TODO need to add a test to grep log files.