diff --git a/Control/AthenaConfiguration/python/AllConfigFlags.py b/Control/AthenaConfiguration/python/AllConfigFlags.py
index e29dc1f944b814ff2cd618d95cffff639ee71c45..0e83b025952e6d221ba91ff19848305b525a3d90 100644
--- a/Control/AthenaConfiguration/python/AllConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AllConfigFlags.py
@@ -83,6 +83,12 @@ def _createCfgFlags():
         return createSimConfigFlags()
     _addFlagsCategory (acf, "Sim", __simulation, 'G4AtlasApps' )
 
+#Digitization Flags:
+    def __digitization():
+        from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
+        return createDigitizationCfgFlags()
+    _addFlagsCategory(acf, "Digitization", __digitization, 'Digitization' )
+
 #Overlay Flags:
     def __overlay():
         from OverlayConfiguration.OverlayConfigFlags import createOverlayConfigFlags
diff --git a/Control/AthenaConfiguration/python/testAllConfigFlags_RDO.py b/Control/AthenaConfiguration/python/testAllConfigFlags_RDO.py
index 421936100bc83b3ff0074b14a0fa0fce5dabf333..b72b78cbf3b9728b4e0e813ed2f3f07af5f258d7 100755
--- a/Control/AthenaConfiguration/python/testAllConfigFlags_RDO.py
+++ b/Control/AthenaConfiguration/python/testAllConfigFlags_RDO.py
@@ -15,6 +15,15 @@ except ImportError:
 if havesim:
     ConfigFlags._loadDynaFlags("Sim")
 
+# Don't fail just because Digitization isn't present in this build.
+haveDigi = True
+try:
+    import Digitization # noqa: F401
+except ImportError:
+    haveDigi = False
+if haveDigi:
+    ConfigFlags._loadDynaFlags("Digitization")
+
 # Don't fail just because OverlayConfiguration isn't present in this build.
 haveOverlay = True
 try:
diff --git a/Event/EventOverlay/OverlayCommonAlgs/test/OverlayCopyAlgs_test.py b/Event/EventOverlay/OverlayCommonAlgs/test/OverlayCopyAlgs_test.py
index 2ba53d145813aab717af2506a2925abfb9ae7b9d..68aa15aaa6847071882563a5630cd910068916c1 100755
--- a/Event/EventOverlay/OverlayCommonAlgs/test/OverlayCopyAlgs_test.py
+++ b/Event/EventOverlay/OverlayCommonAlgs/test/OverlayCopyAlgs_test.py
@@ -11,8 +11,6 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.MainServicesConfig import MainServicesThreadedCfg
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
-from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
-from OverlayCommonAlgs.OverlayConfigFlags import createOverlayCfgFlags
 from OverlayCommonAlgs.OverlayCopyAlgsConfig import CopyMcEventCollectionCfg
 
 # Global test config
@@ -21,8 +19,6 @@ nThreads = 1
 # Configure
 Configurable.configurableRun3Behavior = True
 
-ConfigFlags.join(createDigitizationCfgFlags())
-ConfigFlags.join(createOverlayCfgFlags())
 ConfigFlags.Input.Files = defaultTestFiles.RDO_BKG
 ConfigFlags.Input.SecondaryFiles = defaultTestFiles.HITS
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
diff --git a/InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py b/InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py
index 55a411a95494e6dd424b1f3edf380b1c3d66764a..5974a06ce1a4066ca3cbc8864414e60e89fb451d 100755
--- a/InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py
+++ b/InnerDetector/InDetDigitization/BCM_Digitization/test/BCM_DigitizationConfigNew_test.py
@@ -12,14 +12,12 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
-from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
 from BCM_Digitization.BCM_DigitizationConfigNew import BCM_DigitizationCfg
 
 # Set up logging and new style config
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 # Configure
-ConfigFlags.join(createDigitizationCfgFlags())
 ConfigFlags.Input.Files = defaultTestFiles.HITS
 ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
 ConfigFlags.GeoModel.Align.Dynamic = False
diff --git a/InnerDetector/InDetDigitization/PixelDigitization/test/PixelDigitizationConfigNew_test.py b/InnerDetector/InDetDigitization/PixelDigitization/test/PixelDigitizationConfigNew_test.py
index 5671e1f8cda1d1f3b84f11849f8cba7243cafe32..39fb0beae45e69c0d18fd1d3e37bb5622515decd 100755
--- a/InnerDetector/InDetDigitization/PixelDigitization/test/PixelDigitizationConfigNew_test.py
+++ b/InnerDetector/InDetDigitization/PixelDigitization/test/PixelDigitizationConfigNew_test.py
@@ -22,13 +22,11 @@ from PixelDigitization.PixelDigitizationConfigNew import (
     PixelDigitizationSplitNoMergePUToolCfg, PixelDigitizationOverlayToolCfg, PixelRangeCfg,
     PixelDigitizationHSCfg, PixelDigitizationPUCfg, PixelDigitizationOverlayCfg,
 )
-from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
 
 # Set up logging and new style config
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 # Configure
-ConfigFlags.join(createDigitizationCfgFlags())
 ConfigFlags.Input.Files = defaultTestFiles.HITS
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
 ConfigFlags.GeoModel.Align.Dynamic = False
diff --git a/InnerDetector/InDetDigitization/SCT_Digitization/test/SCT_DigitizationConfigNew_test.py b/InnerDetector/InDetDigitization/SCT_Digitization/test/SCT_DigitizationConfigNew_test.py
index 99382fa8b661d2c30533db5a627d37bdd825bdd3..a543fb71274f2df5b5c04900702d4bc9160119cb 100755
--- a/InnerDetector/InDetDigitization/SCT_Digitization/test/SCT_DigitizationConfigNew_test.py
+++ b/InnerDetector/InDetDigitization/SCT_Digitization/test/SCT_DigitizationConfigNew_test.py
@@ -13,13 +13,11 @@ from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from AtlasGeoModel.InDetGMConfig import InDetGeometryCfg
 from SCT_Digitization.SCT_DigitizationConfigNew import SCT_DigitizationHSCfg
-from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
 
 # Set up logging and new style config
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 # Configure
-ConfigFlags.join(createDigitizationCfgFlags())
 ConfigFlags.Input.Files = defaultTestFiles.HITS
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
 ConfigFlags.GeoModel.Align.Dynamic = False
diff --git a/InnerDetector/InDetDigitization/TRT_Digitization/test/TRT_DigitizationConfigNew_test.py b/InnerDetector/InDetDigitization/TRT_Digitization/test/TRT_DigitizationConfigNew_test.py
index f45b643c1acd771b269f23cb9af93d8274f1e7c9..8990b8babb400890c5fb8cc27541827bd6e82255 100755
--- a/InnerDetector/InDetDigitization/TRT_Digitization/test/TRT_DigitizationConfigNew_test.py
+++ b/InnerDetector/InDetDigitization/TRT_Digitization/test/TRT_DigitizationConfigNew_test.py
@@ -14,13 +14,11 @@ from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from AtlasGeoModel.InDetGMConfig import InDetGeometryCfg
 from TRT_Digitization.TRT_DigitizationConfigNew import TRT_DigitizationHSCfg
-from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
 
 # Set up logging and new style config
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 # Configure
-ConfigFlags.join(createDigitizationCfgFlags())
 ConfigFlags.Input.Files = defaultTestFiles.HITS
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
 ConfigFlags.GeoModel.Align.Dynamic = False
diff --git a/InnerDetector/InDetRawAlgs/InDetOverlay/test/SCTOverlayConfig_test.py b/InnerDetector/InDetRawAlgs/InDetOverlay/test/SCTOverlayConfig_test.py
index 939e50c33a1f2d0687f26df57546df0b067c536b..d571d7400c7f892efb2228974a35a76a14f5f244 100755
--- a/InnerDetector/InDetRawAlgs/InDetOverlay/test/SCTOverlayConfig_test.py
+++ b/InnerDetector/InDetRawAlgs/InDetOverlay/test/SCTOverlayConfig_test.py
@@ -11,7 +11,6 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.MainServicesConfig import MainServicesThreadedCfg
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
-from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
 from OverlayCommonAlgs.OverlayCopyAlgsConfig import CopyMcEventCollectionCfg
 from InDetOverlay.SCTOverlayConfig import SCTOverlayCfg
 
@@ -21,7 +20,6 @@ nThreads = 1
 # Configure
 Configurable.configurableRun3Behavior = True
 
-ConfigFlags.join(createDigitizationCfgFlags())
 ConfigFlags.Input.Files = defaultTestFiles.RDO_BKG
 ConfigFlags.Input.SecondaryFiles = defaultTestFiles.HITS
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
diff --git a/MuonSpectrometer/MuonDigitization/CSC_Digitization/test/CSC_DigitizationConfigNew_test.py b/MuonSpectrometer/MuonDigitization/CSC_Digitization/test/CSC_DigitizationConfigNew_test.py
index 6ef1d83b5f6a908c87c19ae55eb78c377b2e1202..bc4614529b0d82fff2f48a2304a436b3e2d7708d 100755
--- a/MuonSpectrometer/MuonDigitization/CSC_Digitization/test/CSC_DigitizationConfigNew_test.py
+++ b/MuonSpectrometer/MuonDigitization/CSC_Digitization/test/CSC_DigitizationConfigNew_test.py
@@ -10,7 +10,6 @@ from AthenaCommon.Configurable import Configurable
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
-from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from CSC_Digitization.CSC_DigitizationConfigNew import CSC_DigitBuilderCfg
 
@@ -21,7 +20,6 @@ Configurable.configurableRun3Behavior = True
 ConfigFlags.Input.Files = defaultTestFiles.HITS
 ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
-ConfigFlags.join(createDigitizationCfgFlags())
 ConfigFlags.lock()
 # Function tests
 # Construct our accumulator to run
diff --git a/MuonSpectrometer/MuonDigitization/MDT_Digitization/test/MDT_DigitizationConfigNew_test.py b/MuonSpectrometer/MuonDigitization/MDT_Digitization/test/MDT_DigitizationConfigNew_test.py
index c02ea876efe32012a618c915ffe4d306dfa56d19..316ecc2f8c63290040de19aaa525434d6c0f944c 100755
--- a/MuonSpectrometer/MuonDigitization/MDT_Digitization/test/MDT_DigitizationConfigNew_test.py
+++ b/MuonSpectrometer/MuonDigitization/MDT_Digitization/test/MDT_DigitizationConfigNew_test.py
@@ -11,7 +11,6 @@ from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
-from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
 # MDT imports
 from MDT_Digitization.MDT_DigitizationConfigNew import MDT_DigitizerCfg
 # Set up logging and new style config
@@ -21,7 +20,6 @@ Configurable.configurableRun3Behavior = True
 ConfigFlags.Input.Files = defaultTestFiles.HITS_SPECIAL
 ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
-ConfigFlags.join(createDigitizationCfgFlags())
 ConfigFlags.lock()
 # Construct our accumulator to run
 acc = MainServicesSerialCfg()
diff --git a/MuonSpectrometer/MuonDigitization/RPC_Digitization/test/RPC_DigitizationConfigNew_test.py b/MuonSpectrometer/MuonDigitization/RPC_Digitization/test/RPC_DigitizationConfigNew_test.py
index e15f9deb9f917861ed724c3b3a3ac00afd4a18d3..f0ed13c899a3b4ca900827bc091320a8fe4e0664 100755
--- a/MuonSpectrometer/MuonDigitization/RPC_Digitization/test/RPC_DigitizationConfigNew_test.py
+++ b/MuonSpectrometer/MuonDigitization/RPC_Digitization/test/RPC_DigitizationConfigNew_test.py
@@ -11,7 +11,6 @@ from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
-from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
 # RPC imports
 from RPC_Digitization.RPC_DigitizationConfigNew import (
     RPC_RangeToolCfg, RPC_DigitizationToolCfg, RPC_DigitizerCfg,
@@ -25,7 +24,6 @@ Configurable.configurableRun3Behavior = True
 ConfigFlags.Input.Files = defaultTestFiles.HITS
 ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
-ConfigFlags.join(createDigitizationCfgFlags())
 ConfigFlags.lock()
 # Construct our accumulator to run
 acc = MainServicesSerialCfg()
diff --git a/MuonSpectrometer/MuonDigitization/TGC_Digitization/test/TGC_DigitizationConfigNew_test.py b/MuonSpectrometer/MuonDigitization/TGC_Digitization/test/TGC_DigitizationConfigNew_test.py
index 4bb482664c64dff556da008020539808d7e9a84b..27c4674d11966c4576b778b28b73daa21d49a5f1 100755
--- a/MuonSpectrometer/MuonDigitization/TGC_Digitization/test/TGC_DigitizationConfigNew_test.py
+++ b/MuonSpectrometer/MuonDigitization/TGC_Digitization/test/TGC_DigitizationConfigNew_test.py
@@ -10,7 +10,6 @@ from AthenaCommon.Configurable import Configurable
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
-from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
 from AthenaConfiguration.AllConfigFlags import ConfigFlags
 # TGC imports
 from TGC_Digitization.TGC_DigitizationConfigNew import (
@@ -25,7 +24,6 @@ Configurable.configurableRun3Behavior = True
 ConfigFlags.Input.Files = defaultTestFiles.HITS
 ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"
-ConfigFlags.join(createDigitizationCfgFlags())
 ConfigFlags.lock()
 # Construct our accumulator to run
 acc = MainServicesSerialCfg()
diff --git a/Simulation/Digitization/test/DigitizationConfigNew_test.py b/Simulation/Digitization/test/DigitizationConfigNew_test.py
index 9f6cdd9ab4b2c7b4b2c8b3c3661b5b2120d8562f..90dab2c92657657473bdeeff0db051705f256f3c 100755
--- a/Simulation/Digitization/test/DigitizationConfigNew_test.py
+++ b/Simulation/Digitization/test/DigitizationConfigNew_test.py
@@ -11,7 +11,6 @@ from AthenaConfiguration.AllConfigFlags import ConfigFlags
 from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
 from AthenaConfiguration.TestDefaults import defaultTestFiles
 from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
-from Digitization.DigitizationConfigFlags import createDigitizationCfgFlags
 from BCM_Digitization.BCM_DigitizationConfigNew import BCM_DigitizationCfg
 from SCT_Digitization.SCT_DigitizationConfigNew import SCT_DigitizationHSCfg
 from TRT_Digitization.TRT_DigitizationConfigNew import TRT_DigitizationHSCfg
@@ -27,7 +26,6 @@ from LArDigitization.LArDigitizationConfigNew import LArDigitMakerCfg
 log.setLevel(DEBUG)
 Configurable.configurableRun3Behavior = True
 # Configure
-ConfigFlags.join(createDigitizationCfgFlags())
 ConfigFlags.Input.Files = defaultTestFiles.HITS_SPECIAL
 ConfigFlags.Output.RDOFileName = "myRDO.pool.root"
 ConfigFlags.IOVDb.GlobalTag = "OFLCOND-MC16-SDR-16"