diff --git a/scripts/format-code.sh b/scripts/format-code.sh
index 769bf13..86bca3c 100755
--- a/scripts/format-code.sh
+++ b/scripts/format-code.sh
@@ -25,7 +25,7 @@
 fi
 
 # Allow called scripts to know which clang format we are using
-export CLANG_FORMAT="clang-format-6.0"
+export CLANG_FORMAT="clang-format-8"
 IGNORE_FILE=".clang-ignore"
 declare -a IGNORE_LIST
 
diff --git a/scripts/unit-test.py b/scripts/unit-test.py
index 5ee94ec..01514b7 100755
--- a/scripts/unit-test.py
+++ b/scripts/unit-test.py
@@ -809,11 +809,11 @@
 
                 # Run clang-tidy only if the project has a configuration
                 if os.path.isfile('.clang-tidy'):
-                    check_call_cmd('run-clang-tidy-6.0.py', '-p',
+                    check_call_cmd('run-clang-tidy-8.py', '-p',
                                    'build')
                 # Run the basic clang static analyzer otherwise
                 else:
-                    os.environ['SCANBUILD'] = 'scan-build-6.0'
+                    os.environ['SCANBUILD'] = 'scan-build-8'
                     check_call_cmd('ninja', '-C', 'build',
                                    'scan-build')
 
@@ -875,7 +875,7 @@
             maybe_make_coverage()
             run_cppcheck()
             if os.path.isfile('.clang-tidy'):
-                check_call_cmd('run-clang-tidy-6.0.py', '-p', '.')
+                check_call_cmd('run-clang-tidy-8.py', '-p', '.')
 
     else:
         print "Not a supported repo for CI Tests, exit"