diff --git a/MuonSpectrometer/MuonConfig/CMakeLists.txt b/MuonSpectrometer/MuonConfig/CMakeLists.txt
index b5ec0f265afecc5cf771639a7a7585d5eccbfada..75e9962eb281e4ac9cf4e781350fd53c0e6f0264 100644
--- a/MuonSpectrometer/MuonConfig/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConfig/CMakeLists.txt
@@ -10,31 +10,33 @@ atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 atlas_install_data( share/*.ref )
 
-# Configure unit tests
-# Cache alignment will change depending on whether FRONTIER_SERVER is defined.
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_MuonDataDecodeTest )
-atlas_add_test( MuonDataDecodeTest
-                PROPERTIES TIMEOUT 1000
-                PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_MuonDataDecodeTest
-                EXTRA_PATTERNS "GeoModelSvc.MuonDetectorTool.*SZ=|Cache alignment|Range of input|recorded new|map from|DEBUG Reconciled configuration"
-                SCRIPT test/testMuonDataDecode.sh )
+if( NOT SIMULATIONBASE )
+   # Configure unit tests
+   # Cache alignment will change depending on whether FRONTIER_SERVER is defined.
+   file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_MuonDataDecodeTest )
+   atlas_add_test( MuonDataDecodeTest
+                   PROPERTIES TIMEOUT 1000
+                   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_MuonDataDecodeTest
+                   EXTRA_PATTERNS "GeoModelSvc.MuonDetectorTool.*SZ=|Cache alignment|Range of input|recorded new|map from|DEBUG Reconciled configuration"
+                   SCRIPT test/testMuonDataDecode.sh )
 
-# Adding an identical test for the ByteStream identifiable caches (and future RDO caches)
-file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_MuonDataDecodeTest_Cache )
-atlas_add_test( MuonDataDecodeTest_Cache
-                PROPERTIES TIMEOUT 1000
-                PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_MuonDataDecodeTest_Cache
-                EXTRA_PATTERNS "GeoModelSvc.MuonDetectorTool.*SZ=|Cache alignment|Range of input|recorded new|map from"
-                SCRIPT test/testMuonDataDecode_Cache.sh )
+   # Adding an identical test for the ByteStream identifiable caches (and future RDO caches)
+   file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_MuonDataDecodeTest_Cache )
+   atlas_add_test( MuonDataDecodeTest_Cache
+                   PROPERTIES TIMEOUT 1000
+                   PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_MuonDataDecodeTest_Cache
+                   EXTRA_PATTERNS "GeoModelSvc.MuonDetectorTool.*SZ=|Cache alignment|Range of input|recorded new|map from"
+                   SCRIPT test/testMuonDataDecode_Cache.sh )
 
-atlas_add_test( MuonCablingConfigTest
-   SCRIPT python -m MuonConfig.MuonCablingConfig
-   POST_EXEC_SCRIPT nopost.sh )
+   atlas_add_test( MuonCablingConfigTest
+                   SCRIPT python -m MuonConfig.MuonCablingConfig
+                   POST_EXEC_SCRIPT nopost.sh )
 
-atlas_add_test( MuonReconstructionConfigTest
-   SCRIPT python -m MuonConfig.MuonReconstructionConfig
-   POST_EXEC_SCRIPT nopost.sh )
+   atlas_add_test( MuonReconstructionConfigTest
+                   SCRIPT python -m MuonConfig.MuonReconstructionConfig
+                   POST_EXEC_SCRIPT nopost.sh )
 
-atlas_add_test( MuonSegmentFindingConfigTest
-   SCRIPT python -m MuonConfig.MuonSegmentFindingConfig
-   POST_EXEC_SCRIPT nopost.sh )
+   atlas_add_test( MuonSegmentFindingConfigTest
+                   SCRIPT python -m MuonConfig.MuonSegmentFindingConfig
+                   POST_EXEC_SCRIPT nopost.sh )
+endif()
diff --git a/Projects/AthSimulation/package_filters.txt b/Projects/AthSimulation/package_filters.txt
index 6f692506e4b23e1367cd0266c9a02b4d84000af1..01d13cfba1fcce22682cd418593e8c4904462d68 100644
--- a/Projects/AthSimulation/package_filters.txt
+++ b/Projects/AthSimulation/package_filters.txt
@@ -237,6 +237,7 @@
 + MuonSpectrometer/MuonCnv/MuonIdCnv
 + MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool
 + MuonSpectrometer/MuonCnv/MuonSimEventTPCnv
++ MuonSpectrometer/MuonConfig
 + MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondInterface
 + MuonSpectrometer/MuonDetDescr/MuonAGDD
 + MuonSpectrometer/MuonDetDescr/MuonAGDDBase