diff --git a/MuonSpectrometer/MuonCalib/MuonCalibAlgs/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibAlgs/CMakeLists.txt
index c6ecbab52ec16eb4adb9ddf70e2c4820880905b9..e360e754467a1c3536642fad3e1b372122635045 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibAlgs/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibAlgs/CMakeLists.txt
@@ -58,8 +58,4 @@ atlas_add_component( MuonCalibAlgs
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
-
-atlas_add_test( flake8_share
-                SCRIPT flake8 --select=ATL,F,E7,E9,W6 --ignore=F401,F821,ATL900 ${CMAKE_CURRENT_SOURCE_DIR}/share
-                POST_EXEC_SCRIPT nopost.sh )
+atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
diff --git a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/CMakeLists.txt b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/CMakeLists.txt
index 0ff9c728305d059fb65e6bfa43aa2dd88968da5b..0f364468ef86a6970f2ca1af02506b32a0e8dc94 100644
--- a/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCalib/MuonCalibStandAlone/CalibNtupleAnalysisAlg/CMakeLists.txt
@@ -58,8 +58,4 @@ atlas_add_dictionary( CalibNtupleAnalysisAlgDict
 
 # Install files from the package:
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
-
-atlas_add_test( flake8_share
-                SCRIPT flake8 --select=ATL,F,E7,E9,W6 --ignore=F401,F821,ATL900 ${CMAKE_CURRENT_SOURCE_DIR}/share
-                POST_EXEC_SCRIPT nopost.sh )
+atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/CMakeLists.txt b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/CMakeLists.txt
index b1c9f14d84139dd13a7b873621b83cdf3a256f63..305bc7372d86d1686b1b63dc1855edca88dbfa6a 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/CMakeLists.txt
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/CMakeLists.txt
@@ -27,8 +27,4 @@ atlas_add_component( MuonCondCool
 # Install files from the package:
 atlas_install_headers( MuonCondCool )
 atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
-
-atlas_add_test( flake8_share
-                SCRIPT flake8 --select=ATL,F,E7,E9,W6 --ignore=F401,F821,ATL900 ${CMAKE_CURRENT_SOURCE_DIR}/share
-                POST_EXEC_SCRIPT nopost.sh )
+atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/makeRpcTriggerScripts.py b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/makeRpcTriggerScripts.py
index 20c19b23305d7bf0645e1f0f0dda51f03b2d2ebe..2735ca73fefe6ec8a7cd4290eba0d26f138a6cff 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/makeRpcTriggerScripts.py
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondCool/share/makeRpcTriggerScripts.py
@@ -187,7 +187,6 @@ MessageSvc.OutputLevel = VERBOSE
     
 # big loop over all directories    
 for i in range(len(EtaSXX)):
-	
     # take care of eta
     #------------------------------
     EtaSXXi= EtaSXX[i].strip('\n')
@@ -223,7 +222,7 @@ for i in range(len(EtaSXX)):
     for j in range(len(EtaSXXmu6)):
         EtaChannel+= 1
         printfunc ("low pt EtaChannel= ", EtaChannel)
-	
+
         EtaSXXmu6[j]=EtaSXXmu6[j].strip('\n')
         fileSuffix= EtaSXXmu6[j].split('_')[4]
         EtaName_CM6= EtaSXXmu6[j].replace('_'+fileSuffix,'')
@@ -250,7 +249,6 @@ for i in range(len(EtaSXX)):
    
     #loop over phi files
     for j in range(len(PhiSXXmu)):
-	    
         PhiChannel+= 1
         printfunc ("PhiChannel= ", PhiChannel)
         PhiSXXmu[j]=PhiSXXmu[j].strip('\n')