diff --git a/AtlasTest/CITest/AthSimulation.cmake b/AtlasTest/CITest/AthSimulation.cmake
index 456f743b390f3edf5d4afbe55459ad1369f5ccc0..57dc73289f49db3c40ec85217f2b570f463afecd 100644
--- a/AtlasTest/CITest/AthSimulation.cmake
+++ b/AtlasTest/CITest/AthSimulation.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 #
 # CI test definitions for the AthSimulation project
 # --> README.md before you modify this file
@@ -8,6 +8,6 @@ atlas_add_citest( DuplicateClass
    SCRIPT python -c 'import ROOT'
    PROPERTIES FAIL_REGULAR_EXPRESSION "class .* is already in" )
 
-# TODO:
-#   G4ExHive
-#   SimulationTier0
+atlas_add_citest( G4ExHive
+   SCRIPT athena.py --threads=4 --evtMax=50 G4AtlasApps/jobOptions.G4AtlasMT.py
+   PROPERTIES PROCESSORS 4 )
diff --git a/AtlasTest/CITest/Athena.cmake b/AtlasTest/CITest/Athena.cmake
index ba94b57e44081df7a2f6a1d427f1de415abf9cbb..c355f5dfc2c2612366f2c91f063fbcd4a902194e 100644
--- a/AtlasTest/CITest/Athena.cmake
+++ b/AtlasTest/CITest/Athena.cmake
@@ -11,9 +11,23 @@ atlas_add_citest( DuplicateClass
    SCRIPT python -c 'import ROOT'
    PROPERTIES FAIL_REGULAR_EXPRESSION "class .* is already in" )
 
-# TODO: minimal set of tests for now
+#################################################################################
+# Digitization/Simulation
+#################################################################################
+
+atlas_add_citest( G4ExHive
+   SCRIPT athena.py --threads=4 --evtMax=50 G4AtlasApps/jobOptions.G4AtlasMT.py
+   PROPERTIES PROCESSORS 4 )
+
+
+# TODO: We stop here for now (migration ongoing...)
 return()
 
+
+
+
+
+
 #################################################################################
 # Reconstruction
 #################################################################################
@@ -70,10 +84,6 @@ atlas_add_citest( DigitizationNewConfig
 atlas_add_citest( FastChain
    SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/test/FastChain.sh )
 
-atlas_add_citest( G4ExHive
-   SCRIPT athena.py --threads=4 --evtMax=50 G4AtlasApps/jobOptions.G4AtlasMT.py
-   PROPERTIES PROCESSORS 4 )
-
 atlas_add_citest( MuonDigiReco_digi
    SCRIPT Digi_tf.py --inputHITSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/MuonRecRTT/Run3/HITS/AsymmetricLayout_HITS_v2.root --imf False --outputRDOFile OUT_RDO.root --conditionsTag OFLCOND-MC16-SDR-RUN3-02 )