diff --git a/.travis.yml b/.travis.yml
index 84164a9d..c4fa44db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,4 +13,4 @@ before_install:
   - sudo docker build -t rcldocker .
 
 script:
-  - sudo docker run -v $(pwd):/root/rclnodejs --rm rcldocker bash -i -c 'cd /root/rclnodejs && ./scripts/build.sh && npm test'
+  - sudo docker run -v $(pwd):/root/rclnodejs --rm rcldocker bash -i -c 'cd /root/rclnodejs && cppcheck --enable=all src/*.cpp src/*.hpp && ./scripts/build.sh && npm test'
diff --git a/Dockerfile b/Dockerfile
index e33b98db..b50317a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,7 +35,8 @@ RUN  apt update && apt install -y \
      python3-setuptools \
      python3-yaml \
      python3-colcon-common-extensions \
-     cmake
+     cmake \
+     cppcheck
 
 RUN pip3 install -U setuptools
 
diff --git a/circle.yml b/circle.yml
index bc5407a7..9dc08495 100644
--- a/circle.yml
+++ b/circle.yml
@@ -6,7 +6,7 @@ dependencies:
   pre:
     - brew update
     - brew uninstall python
-    - brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/f2a764ef944b1080be64bd88dca9a1d80130c558/Formula/python.rb
+    - brew install python
     - brew install python@2
     - brew install wget cmake cppcheck tinyxml eigen pcre poco
     # install dependencies for Fast-RTPS if you are using it