diff --git a/.travis.yml b/.travis.yml
index 9e78797c..4b6fde61 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: trusty
+dist: bionic
 sudo: true
 
 addons:
@@ -9,7 +9,6 @@ addons:
     - libgeoip-dev
     - liblua5.2-dev
     - liblmdb-dev
-    - cppcheck
 
 language: cpp
 
@@ -38,9 +37,12 @@ before_script:
   - '[ "$TRAVIS_OS_NAME" != osx ] || brew install libmaxminddb'
   - '[ "$TRAVIS_OS_NAME" != osx ] || brew install lmdb'
   - '[ "$TRAVIS_OS_NAME" != linux ] || sudo add-apt-repository --yes ppa:maxmind/ppa'
+  - '[ "$TRAVIS_OS_NAME" != linux ] || sudo add-apt-repository --yes ppa:grochefort/cppcheck'
   - '[ "$TRAVIS_OS_NAME" != linux ] || sudo apt-get update'
   - '[ "$TRAVIS_OS_NAME" != linux ] || sudo apt-cache search maxmind'
   - '[ "$TRAVIS_OS_NAME" != linux ] || sudo apt-get install -y libmaxminddb-dev'
+  - '[ "$TRAVIS_OS_NAME" != linux ] || sudo apt-get install -y cppcheck'
+  - '[ "$TRAVIS_OS_NAME" != linux ] || cppcheck --version'
 
 script:
   - ./build.sh
diff --git a/Makefile.am b/Makefile.am
index ab007193..760d0d40 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,7 +64,9 @@ cppcheck:
 		--template="warning: {file},{line},{severity},{id},{message}" \
 		-I headers -I . -I others -I src -I others/mbedtls -I src/parser \
 		--error-exitcode=1 \
-		-i "src/parser/seclang-parser.cc" -i "src/parser/seclang-scanner.cc" \
+		-i "src/parser/seclang-parser.cc" \
+		-i "src/parser/seclang-scanner.cc" \
+		-i "parser/driver.cc" \
 		--force --verbose .