diff --git a/readme.md b/readme.md
index e79b18611b7c092e436c5cb9f070c7b4bebf97d2..96518d754fdd1b6ffc1546a19fb5e8b8157d5615 100644
--- a/readme.md
+++ b/readme.md
@@ -123,8 +123,8 @@ The software is provided under a [BSD-3-Clause license](https://spdx.org/license
 Feedback and Support
 --------------------
 
-Arm welcomes any feedback on SCP-firmware. Please contact the maintainers (
-see [maintainers.md](./maintainers.md)).
+Arm welcomes any feedback on SCP-firmware. Please contact the maintainers (see
+maintainers.md).
 
 To request support please contact Arm by email at support@arm.com. Arm licensees
 may also contact Arm via their partner managers.
diff --git a/tools/build_string.py b/tools/build_string.py
index d9cc38db661b118a9cacebb2067ec09249ee587e..7a3732f8180dc417bc598e5aee2c5087f5fb84c9 100755
--- a/tools/build_string.py
+++ b/tools/build_string.py
@@ -16,7 +16,7 @@ def main():
         cmd = 'git describe --tags --dirty --always'
         output = subprocess.check_output(cmd.split())
         git_string = output.decode('utf-8').strip()
-    except:
+    except BaseException:
         git_string = 'Unknown'
 
     print("{}-{}".format(datetime.now().strftime('%Y-%m-%d_%H-%M-%S'),
diff --git a/tools/check_copyright.py b/tools/check_copyright.py
index 8901d0f96fd359ee0d6ff1de517e14fdb854fb83..584bbbcb50d7a54524de092ac6de47f89ef09d21 100755
--- a/tools/check_copyright.py
+++ b/tools/check_copyright.py
@@ -47,15 +47,15 @@ FILE_TYPES = [
 #
 # Supported comment styles (Python regex)
 #
-COMMENT_PATTERN = '^(( \*)|(;)|(\#))'
+COMMENT_PATTERN = '^(( \\*)|(;)|(\\#))'
 
 #
 # License pattern to match
 #
 LICENSE_PATTERN = \
     '{0} Arm SCP/MCP Software$\n'\
-    '{0} Copyright \(c\) (?P<years>[0-9]{{4}}(-[0-9]{{4}})?), Arm Limited and'\
-    ' Contributors. All rights reserved.$\n'\
+    '{0} Copyright \\(c\\) (?P<years>[0-9]{{4}}(-[0-9]{{4}})?), Arm Limited '\
+    'and Contributors. All rights reserved.$\n'\
     '{0}$\n'\
     '{0} SPDX-License-Identifier: BSD-3-Clause$\n'\
     .format(COMMENT_PATTERN)
diff --git a/tools/check_spacing.py b/tools/check_spacing.py
index 49bc128a95390d4416145671851abdfee44ca0bc..afbb668b2ab3296fe54d722cc8c4c49228ef6883 100755
--- a/tools/check_spacing.py
+++ b/tools/check_spacing.py
@@ -120,7 +120,7 @@ def main(argv=[], prog_name=''):
 
         for keyword in KEYWORDS:
             regex_patterns[keyword] = re.compile(
-                '(.*\W)(%s)(\s*)(\(.*)' % keyword)
+                '(.*\\W)(%s)(\\s*)(\\(.*)' % keyword)
         #
         # Check files
         #
diff --git a/tools/check_style.py b/tools/check_style.py
index 7e6665decbbc05ca36e18699e5bccd06ff376fa7..caebae5ac98eb16415dc7e552f38846f05918405 100755
--- a/tools/check_style.py
+++ b/tools/check_style.py
@@ -166,5 +166,6 @@ def main(argv=[], prog_name=''):
     print('PASSED: No files contained coding style errors.')
     return 0
 
+
 if __name__ == '__main__':
     sys.exit(main(sys.argv[1:], sys.argv[0]))
diff --git a/tools/ci.py b/tools/ci.py
index c0e276b1496d0450d62e657c089cf510e04b92b3..b31a5d3f73321e675ee2477fce1f6dd28dbd06c7 100755
--- a/tools/ci.py
+++ b/tools/ci.py
@@ -37,43 +37,55 @@ def main():
     result = check_doc.main()
     results.append(('Check doc', result))
 
-    result = subprocess.call('pep8 tools/', shell=True)
-    results.append(('PEP8', result))
+    result = subprocess.call('python -m pycodestyle tools/', shell=True)
+    results.append(('PyCodeStyle', result))
 
     banner('Build and run framework tests')
 
-    result = subprocess.call('make clean test', shell=True)
+    result = subprocess.call('CC=gcc make clean test', shell=True)
     results.append(('Framework tests', result))
 
     banner('Test building the framework library')
 
-    cmd = 'CROSS_COMPILE= BS_FIRMWARE_CPU=host make lib-framework'
+    cmd = \
+        'CC=gcc CROSS_COMPILE= BS_FIRMWARE_CPU=host ' \
+        'make clean lib-framework'
     result = subprocess.call(cmd, shell=True)
-    results.append(('Framework build (host)', result))
+    results.append(('Framework build (Host, GCC)', result))
 
-    cmd = 'CROSS_COMPILE=arm-none-eabi- BS_FIRMWARE_CPU=cortex-m3 make '\
-          'lib-framework'
+    cmd = \
+        'CC=arm-none-eabi-gcc CROSS_COMPILE=arm-none-eabi- ' \
+        'BS_FIRMWARE_CPU=cortex-m3 ' \
+        'make clean lib-framework'
     result = subprocess.call(cmd, shell=True)
-    results.append(('Framework build (Cortex-M3)', result))
+    results.append(('Framework build (Cortex-M3, GCC)', result))
 
     banner('Test building arch library')
 
-    cmd = 'CROSS_COMPILE=arm-none-eabi- BS_FIRMWARE_CPU=cortex-m3 make '\
-          'lib-arch'
+    cmd = \
+        'CC=arm-none-eabi-gcc CROSS_COMPILE=arm-none-eabi- ' \
+        'BS_FIRMWARE_CPU=cortex-m3 ' \
+        'make clean lib-arch'
     result = subprocess.call(cmd, shell=True)
-    results.append(('Arch build (Cortex-M3)', result))
+    results.append(('Arch build (Cortex-M3, GCC)', result))
 
     banner('Test building host product')
 
-    cmd = 'CROSS_COMPILE= PRODUCT=host make '
+    cmd = \
+        'CC=gcc CROSS_COMPILE= ' \
+        'PRODUCT=host ' \
+        'make clean all'
     result = subprocess.call(cmd, shell=True)
-    results.append(('Product host build', result))
+    results.append(('Product host build (GCC)', result))
 
     banner('Test building sgm775 product')
 
-    cmd = 'CROSS_COMPILE=arm-none-eabi- PRODUCT=sgm775 make'
+    cmd = \
+        'CC=arm-none-eabi-gcc CROSS_COMPILE=arm-none-eabi- ' \
+        'PRODUCT=sgm775 ' \
+        'make clean all'
     result = subprocess.call(cmd, shell=True)
-    results.append(('Product sgm775 build', result))
+    results.append(('Product sgm775 build (GCC)', result))
 
     banner('Tests summary')