diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9e7f804d..6727e3c2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -72,6 +72,30 @@ jobs:
               docker push "${DOCKERHUB_REPO}:${CIRCLE_TAG}"
             fi
 
+  lint:
+    docker:
+      - image: circleci/python:3.7.9
+    steps:
+      - checkout
+      - run:
+          name: Install dependencies
+          command: |
+            pip install --upgrade cardboardlint pylint
+      - run:
+          name: Run linter
+          command: |
+            set -ex
+            # Check if branch can be merged with master (if failing script will stop due to set -e)
+            git config user.email "you@example.com"
+            git config user.name "Your Name"
+            git merge --no-commit --no-ff origin/master
+
+            # Undo merge changes if any
+            git reset --hard $CIRCLE_BRANCH
+
+            # Lint differences against master
+            cardboardlinter --refspec origin/master -n auto;
+
 workflows:
   version: 2
   build-deploy:
@@ -87,3 +111,7 @@ workflows:
           filters:
             tags:
               only: /.*/
+
+  lint:
+    jobs:
+      - lint
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index f64b1a34..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-language: python
-
-cache: pip
-before_cache:
-  - rm ~/.cache/pip/log/debug.log
-
-python:
-  - "3.6"
-
-jobs:
-  include:
-    - name: cardboard linter
-      install:
-        - pip install --upgrade cardboardlint pylint
-      script: |
-        # Run cardboardlinter, in case of pull requests
-        if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-          if [ "$TRAVIS_BRANCH" != "master" ]; then
-            git fetch origin $TRAVIS_BRANCH:$TRAVIS_BRANCH
-          fi
-          cardboardlinter --refspec $TRAVIS_BRANCH -n auto;
-        fi