diff --git a/Control/AthenaConfiguration/CMakeLists.txt b/Control/AthenaConfiguration/CMakeLists.txt
index 97c7eda799890c130faa70b3fd7d65b02955a799..dd098c4633272bcb0986b41d78e0549a36f61550 100644
--- a/Control/AthenaConfiguration/CMakeLists.txt
+++ b/Control/AthenaConfiguration/CMakeLists.txt
@@ -9,7 +9,8 @@ atlas_subdir( AthenaConfiguration )
 find_package( six )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py python/iconfTool )
+atlas_install_python_modules( python/*.py python/iconfTool 
+                              POST_BUILD_CMD ${ATLAS_FLAKE8} )
 atlas_install_scripts( share/confTool.py python/iconfTool/iconfTool )
 atlas_install_data( share/*.ref )
 
@@ -43,13 +44,6 @@ if( NOT "${CMAKE_PROJECT_NAME}" STREQUAL "AthSimulation" )
                     POST_EXEC_SCRIPT nopost.sh )
 endif()
 
-
-# Check python syntax:
-atlas_add_test( flake8
-   SCRIPT flake8 --select=ATL,F,E7,E9,W6 ${CMAKE_CURRENT_SOURCE_DIR}/python
-   POST_EXEC_SCRIPT nopost.sh )
-
-
 # Test AppendToGlobal
 atlas_add_test( appendToGlobalTest
 		SCRIPT athena.py testAppendToGlobals.py
diff --git a/Control/AthenaConfiguration/python/TestDefaults.py b/Control/AthenaConfiguration/python/TestDefaults.py
index dc9611b3bb3b1fc65282e59ed202f6779ef9c4cd..462ee296e5fdd9ac7552868abe227d5b98592155 100644
--- a/Control/AthenaConfiguration/python/TestDefaults.py
+++ b/Control/AthenaConfiguration/python/TestDefaults.py
@@ -1,4 +1,5 @@
-#Files for use in configuration unit tests
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Files for use in configuration unit tests
 
 from __future__ import print_function
 
diff --git a/Control/AthenaConfiguration/python/iconfTool/utils/serialization.py b/Control/AthenaConfiguration/python/iconfTool/utils/serialization.py
index 7728e8fd752c291f97d462e9d60818a40dbec740..f0e762c582134146fe60afc9b576a8a2229597a0 100644
--- a/Control/AthenaConfiguration/python/iconfTool/utils/serialization.py
+++ b/Control/AthenaConfiguration/python/iconfTool/utils/serialization.py
@@ -1,3 +1,4 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 import pickle