diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ByteStreamErrorsTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ByteStreamErrorsTestAlgConfig.py
index 931ba6945007d2605bcdd3b697931e92fc108440..fe9cc8eea3ed7beab56d935fde5fed41cc43e2a2 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ByteStreamErrorsTestAlgConfig.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_ByteStreamErrorsTestAlgConfig.py
@@ -41,4 +41,4 @@ if __name__=="__main__":
     algkwargs["OutputLevel"] = INFO
     cfg.merge(SCT_ByteStreamErrorsTestAlgCfg(ConfigFlags, **algkwargs))
 
-    cfg.run(maxEvents=20)
+    cfg.run(maxEvents=25)
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_FlaggedConditionTestAlgConfig.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_FlaggedConditionTestAlgConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..8b970993103d19bfabc03ae629bc4769c4fe05ea
--- /dev/null
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/python/SCT_FlaggedConditionTestAlgConfig.py
@@ -0,0 +1,44 @@
+"""Define method to configure and test SCT_FlaggedConditionTestAlg
+
+Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+"""
+from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
+from AthenaConfiguration.ComponentFactory import CompFactory
+
+def SCT_FlaggedConditionTestAlgCfg(flags, name="SCT_FlaggedConditionTestAlg", **kwargs):
+    """Return a configured SCT_FlaggedConditionTestAlg"""
+    acc = ComponentAccumulator()
+    from InDetConfig.InDetRecToolConfig import SCT_FlaggedConditionToolCfg
+    kwargs.setdefault("FlaggedConditionTool", acc.popToolsAndMerge(SCT_FlaggedConditionToolCfg(flags)))
+    acc.addEventAlgo(CompFactory.SCT_FlaggedConditionTestAlg(**kwargs))
+    return acc
+
+if __name__=="__main__":
+    from AthenaCommon.Logging import log
+    from AthenaCommon.Constants import INFO
+    log.setLevel(INFO)
+
+    from AthenaCommon.Configurable import Configurable
+    Configurable.configurableRun3Behavior=1
+    
+    from AthenaConfiguration.AllConfigFlags import ConfigFlags
+    ConfigFlags.Input.isMC = False
+    ConfigFlags.Input.Files = ["./myESD.pool.root"]
+    ConfigFlags.Input.ProjectName = "data17_13TeV" # q431 input
+    ConfigFlags.Input.RunNumber = 330470 # q431 input
+    ConfigFlags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2018-03" # q431 setup
+    ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01" # q431 setup
+    ConfigFlags.Detector.GeometrySCT = True
+    ConfigFlags.lock()
+
+    from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+    cfg = MainServicesCfg(ConfigFlags)
+
+    from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
+    cfg.merge(PoolReadCfg(ConfigFlags))
+
+    algkwargs = {}
+    algkwargs["OutputLevel"] = INFO
+    cfg.merge(SCT_FlaggedConditionTestAlgCfg(ConfigFlags, **algkwargs))
+
+    cfg.run(maxEvents=25)
diff --git a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testFlagged.py b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testFlagged.py
index edf7353918aae18d5dbc5485b287ee6663357aba..cc4f961850660d8058fc9b2d05db360949077a8a 100644
--- a/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testFlagged.py
+++ b/InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/share/testFlagged.py
@@ -96,7 +96,7 @@ import AthenaPoolCnvSvc.ReadAthenaPool
 from PoolSvc.PoolSvcConf import PoolSvc
 ServiceMgr += PoolSvc()
 
-athenaCommonFlags.FilesInput = [ "./ESD.pool.root" ]
+athenaCommonFlags.FilesInput = [ "./myESD.pool.root" ]
 ServiceMgr.EventSelector.InputCollections = athenaCommonFlags.FilesInput.get_Value()
 
 theApp.EvtMax = -1
diff --git a/InnerDetector/InDetConfig/python/InDetRecToolConfig.py b/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
index 640aec7d2fce85b6b07cde857167ec07bc76cb53..d7b58eb7e96e446239af7d66bc8041e521ea5392 100644
--- a/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
+++ b/InnerDetector/InDetConfig/python/InDetRecToolConfig.py
@@ -415,8 +415,13 @@ def SCT_ReadCalibDataToolCfg(flags, name="SCT_ReadCalibDataTool", cond_kwargs={}
 
 
 def SCT_FlaggedConditionToolCfg(flags, name="SCT_FlaggedConditionTool", **kwargs):
-  tool = CompFactory.SCT_FlaggedConditionTool(name, **kwargs)
   result = ComponentAccumulator()
+
+  # For SCT_ID and SCT_DetectorElementCollection used in SCT_FlaggedConditionTool
+  from SCT_GeoModel.SCT_GeoModelConfig import SCT_GeometryCfg
+  result.merge(SCT_GeometryCfg(flags))
+
+  tool = CompFactory.SCT_FlaggedConditionTool(name, **kwargs)
   result.setPrivateTools(tool)
   return result