diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_build.sh
new file mode 100755
index 0000000000000000000000000000000000000000..bb7d4332e51e6fdc9b7ed1b7248356c0aa2b0551
--- /dev/null
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_slice_mu_mc_build.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# art-description: athenaMT trigger test on MC running L1 simulation and the muon menu
+# art-type: build
+# art-include: master/Athena
+# art-output: *.log
+# art-output: *.new
+# art-output: *.txt
+# art-output: *.root
+
+export EVENTS=10
+export THREADS=1
+export SLOTS=1
+export INPUT="run2mc_ttbar"
+export JOBOPTION="TrigUpgradeTest/full_menu.py"
+export EXTRA="doL1Sim=True;doEmptyMenu=True;doMuonSlice=True"
+
+# This test doesn't produce any output useful for RegTest, so do a dummy reference comparison
+export REGTESTEXP="leaving with code"
+export REGTESTREF=`find_data.py TrigUpgradeTest/dummy_regtest.ref`
+
+
+
+source exec_TrigUpgradeTest_art_athenaMT.sh
+source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
index a40ecbebaedc7cc346a43296ad50c09cc4e9c7ba..f15fc09e0929b2b0d2a3c71563336990cbaff90d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
@@ -3,6 +3,7 @@
 #
 
 from AthenaCommon.Logging import logging
+from AthenaCommon.GlobalFlags import globalflags
 log = logging.getLogger('MuonSetup')
 
 ### Output data name ###
@@ -67,7 +68,8 @@ def makeMuonPrepDataAlgs(forFullScan=False):
                                                  cluster_builder = CscClusterBuilderTool)
 
   eventAlgs_MuonPRD.append( CscRdoToCscPrepData )
-  viewAlgs_MuonPRD.append( CscRawDataProvider )
+  if globalflags.InputFormat.is_bytestream():
+    viewAlgs_MuonPRD.append( CscRawDataProvider )
   viewAlgs_MuonPRD.append( CscRdoToCscPrepData )
   viewAlgs_MuonPRD.append( CscClusterBuilder )
 
@@ -103,7 +105,8 @@ def makeMuonPrepDataAlgs(forFullScan=False):
                                                 )
 
   eventAlgs_MuonPRD.append( MdtRdoToMdtPrepData )
-  viewAlgs_MuonPRD.append( MdtRawDataProvider )
+  if globalflags.InputFormat.is_bytestream():
+    viewAlgs_MuonPRD.append( MdtRawDataProvider )
   viewAlgs_MuonPRD.append( MdtRdoToMdtPrepData )
 
 
@@ -135,9 +138,10 @@ def makeMuonPrepDataAlgs(forFullScan=False):
                                                 DoSeededDecoding = not forFullScan,
                                                 RoIs = "MURoIs")
 
-  eventAlgs_MuonPRD.append( RpcRawDataProvider )
+  if globalflags.InputFormat.is_bytestream():
+    eventAlgs_MuonPRD.append( RpcRawDataProvider )
+    viewAlgs_MuonPRD.append( RpcRawDataProvider )
   eventAlgs_MuonPRD.append( RpcRdoToRpcPrepData )
-  viewAlgs_MuonPRD.append( RpcRawDataProvider )
   viewAlgs_MuonPRD.append( RpcRdoToRpcPrepData )
 
 
@@ -168,9 +172,10 @@ def makeMuonPrepDataAlgs(forFullScan=False):
                                                 DoSeededDecoding = not forFullScan,
                                                 RoIs             = "MURoIs" )
 
-  eventAlgs_MuonPRD.append( TgcRawDataProvider )
+  if globalflags.InputFormat.is_bytestream():
+    eventAlgs_MuonPRD.append( TgcRawDataProvider )
+    viewAlgs_MuonPRD.append( TgcRawDataProvider )
   eventAlgs_MuonPRD.append( TgcRdoToTgcPrepData )
-  viewAlgs_MuonPRD.append( TgcRawDataProvider )
   viewAlgs_MuonPRD.append( TgcRdoToTgcPrepData )
 
   from MuonRecExample.MuonRecFlags import muonRecFlags
@@ -564,10 +569,12 @@ def muEFCBRecoSequence( RoIs, name ):
     ViewVerifyTrk = CfgMgr.AthViews__ViewDataVerifier("muonCBIDViewDataVerifier")
     ViewVerifyTrk.DataObjects = [( 'xAOD::TrackParticleContainer' , 'StoreGateSvc+'+TrackParticlesName ),
                                  ( 'SCT_FlaggedCondData' , 'StoreGateSvc+SCT_FlaggedCondData' ),
-                                 ( 'InDetBSErrContainer' , 'StoreGateSvc+SCT_ByteStreamErrs' ),
                                  ( 'xAOD::EventInfo' , 'StoreGateSvc+EventInfo' ),
-                                 ( 'xAOD::IParticleContainer' , 'StoreGateSvc+'+TrackParticlesName ),
-                                 ( 'SCT_ByteStreamFractionContainer' , 'StoreGateSvc+SCT_ByteStreamFrac' ) ]
+                                 ( 'xAOD::IParticleContainer' , 'StoreGateSvc+'+TrackParticlesName )]
+
+    if globalflags.InputFormat.is_bytestream():
+      ViewVerifyTrk.DataObjects += [( 'InDetBSErrContainer' , 'StoreGateSvc+SCT_ByteStreamErrs' ),
+                                    ( 'SCT_ByteStreamFractionContainer' , 'StoreGateSvc+SCT_ByteStreamFrac' ) ]
     muEFCBRecoSequence += ViewVerifyTrk