diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/CMakeLists.txt b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/CMakeLists.txt
index d083dfad1825329180397afcc64bcbcaabd9c8fb..ff5c6c2a395f2502833ce8d958cc9af73f85470a 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/CMakeLists.txt
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/CMakeLists.txt
@@ -32,7 +32,10 @@ atlas_add_test( TestSCTEncode
                 PROPERTIES TIMEOUT 300
                 ENVIRONMENT THREADS=1 )
 atlas_add_test( TestSCTDecodeNewConf
-                SCRIPT python -m SCT_RawDataByteStreamCnv.SCT_RawDataByteStreamCnvConfig
+                SCRIPT python -m SCT_RawDataByteStreamCnv.testSCTDecodeNewConf
+                PROPERTIES TIMEOUT 600 )
+atlas_add_test( TestSCTEncodeNewConf
+                SCRIPT python -m SCT_RawDataByteStreamCnv.testSCTEncodeNewConf
                 PROPERTIES TIMEOUT 600 )
 
 # Install files from the package:
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/python/SCT_RawDataByteStreamCnvConfig.py b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/python/SCT_RawDataByteStreamCnvConfig.py
index 760a1a4ace1942ac2d5a4aa3a5633dff233efdef..bcdc96b2fe30b46e7244388647a6566b2c1e3c67 100644
--- a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/python/SCT_RawDataByteStreamCnvConfig.py
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/python/SCT_RawDataByteStreamCnvConfig.py
@@ -35,25 +35,3 @@ def SCTEventFlagWriterCfg(flags, prefix="InDet", suffix="", **kwargs):
     acc.addEventAlgo(CompFactory.SCTEventFlagWriter(name=prefix+"SCTEventFlagWriter"+suffix,
                                                     **kwargs))
     return acc
-
-if __name__ == "__main__":
-    from AthenaCommon.Configurable import Configurable
-    Configurable.configurableRun3Behavior = 1
-
-    from AthenaConfiguration.AllConfigFlags import ConfigFlags
-    ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data17_13TeV.00330470.physics_Main.daq.RAW._lb0310._SFO-1._0001.data"]
-    ConfigFlags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2018-03"
-    ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"
-    ConfigFlags.Detector.GeometrySCT = True
-    ConfigFlags.lock()
-
-    from AthenaConfiguration.MainServicesConfig import MainServicesCfg
-    acc = MainServicesCfg(ConfigFlags)
-
-    from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg
-    acc.merge(ByteStreamReadCfg(ConfigFlags))
-
-    acc.merge(SCTRawDataProviderCfg(ConfigFlags))
-    acc.merge(SCTEventFlagWriterCfg(ConfigFlags))
-
-    acc.run(maxEvents=10)
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/python/testSCTDecodeNewConf.py b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/python/testSCTDecodeNewConf.py
new file mode 100644
index 0000000000000000000000000000000000000000..01a2efb6396bba2fd2247cc38f213b7e58bc478e
--- /dev/null
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/python/testSCTDecodeNewConf.py
@@ -0,0 +1,27 @@
+#
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+#
+
+if __name__ == "__main__":
+    from AthenaCommon.Configurable import Configurable
+    Configurable.configurableRun3Behavior = 1
+
+    from AthenaConfiguration.AllConfigFlags import ConfigFlags
+    ConfigFlags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/data17_13TeV.00330470.physics_Main.daq.RAW._lb0310._SFO-1._0001.data"]
+    ConfigFlags.IOVDb.GlobalTag = "CONDBR2-BLKPA-2018-03"
+    ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2016-01-00-01"
+    ConfigFlags.Detector.GeometrySCT = True
+    ConfigFlags.lock()
+
+    from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+    acc = MainServicesCfg(ConfigFlags)
+
+    from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamReadCfg
+    acc.merge(ByteStreamReadCfg(ConfigFlags))
+
+    from SCT_RawDataByteStreamCnv.SCT_RawDataByteStreamCnvConfig import SCTRawDataProviderCfg
+    acc.merge(SCTRawDataProviderCfg(ConfigFlags))
+    from SCT_RawDataByteStreamCnv.SCT_RawDataByteStreamCnvConfig import SCTEventFlagWriterCfg
+    acc.merge(SCTEventFlagWriterCfg(ConfigFlags))
+
+    acc.run(maxEvents=10)
diff --git a/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/python/testSCTEncodeNewConf.py b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/python/testSCTEncodeNewConf.py
new file mode 100644
index 0000000000000000000000000000000000000000..7134a51451760999753fe200c801e36a938c22fc
--- /dev/null
+++ b/InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/python/testSCTEncodeNewConf.py
@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+#
+
+if __name__ == "__main__":
+    from AthenaCommon.Configurable import Configurable
+    Configurable.configurableRun3Behavior = 1
+
+    from AthenaConfiguration.AllConfigFlags import ConfigFlags
+    ConfigFlags.Input.isMC = True
+    ConfigFlags.Input.Files = ["/afs/cern.ch/atlas/project/rig/referencefiles/RTTinputFiles/MC15_13TeV/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r6699_10evt.pool.root"]
+    ConfigFlags.IOVDb.GlobalTag = "OFLCOND-RUN12-SDR-31"
+    ConfigFlags.GeoModel.AtlasVersion = "ATLAS-R2-2015-03-01-00"
+    ConfigFlags.Detector.GeometrySCT = True
+    ConfigFlags.lock()
+
+    from AthenaConfiguration.MainServicesConfig import MainServicesCfg
+    acc = MainServicesCfg(ConfigFlags)
+
+    # For POOL file reading
+    from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
+    acc.merge(PoolReadCfg(ConfigFlags))
+
+    # For ByteStream file writing
+    from ByteStreamCnvSvc.ByteStreamConfig import ByteStreamWriteCfg
+    writingAcc = ByteStreamWriteCfg(ConfigFlags, [ "SCT_RDO_Container#SCT_RDOs" ] )
+    writingAcc.getService("ByteStreamEventStorageOutputSvc").StreamType = "EventStorage"
+    writingAcc.getService("ByteStreamEventStorageOutputSvc").StreamName = "StreamBSFileOutput"
+    acc.merge(writingAcc)
+
+    # For SCT geometry and cabling
+    from SCT_GeoModel.SCT_GeoModelConfig import SCT_GeometryCfg
+    acc.merge(SCT_GeometryCfg(ConfigFlags))
+    from InDetConfig.InDetRecToolConfig import SCT_CablingToolCfg
+    acc.popToolsAndMerge(SCT_CablingToolCfg(ConfigFlags))
+
+    # For EventInfo necessary for ByteStream file writing
+    from xAODEventInfoCnv.xAODEventInfoCnvConfig import EventInfoCnvAlgCfg
+    acc.merge(EventInfoCnvAlgCfg(ConfigFlags,
+                                 inputKey="McEventInfo",
+                                 outputKey="EventInfo"))
+
+    acc.run(maxEvents=10)