diff --git a/.circleci/config.yml b/.circleci/config.yml
index eb61588..6bdc7f3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,5 +1,31 @@
 version: 2
 jobs:
+  test:
+    docker:
+      - image: debian:stable-slim
+        auth:
+          username: $DOCKER_USER
+          password: $DOCKER_PASS
+    working_directory: /app
+    steps:
+      - run:
+          name: Install Docker build dependencies
+          command: |
+            apt update
+            apt install -y git python-pip python2.7 build-essential python2.7-dev default-libmysqlclient-dev default-mysql-client
+      - checkout
+      - setup_remote_docker
+      - run:
+          name: install
+          command: |
+            python2.7 --version
+            pip install virtualenv
+            make build
+      - run:
+          name: test
+          command: |
+            make test
+
   build:
     docker:
       - image: circleci/python
@@ -57,6 +83,11 @@ workflows:
 
   build-test-push:
     jobs:
+      - test:
+          filters:
+            tags:
+              only: /.*/
+
       - build:
           filters:
             tags:
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 4524188..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-language: python
-
-python:
-  - "2.7"
-# The way the selection of the Python version is currently made in Makefile
-# leads to travis always picking up Python 2 for the task.
-# All versions of Python are appearantly present in a travis environment.
-# Once the makefile has been adjusted the following lines should be enabled.
-#  - "3.5"
-#  - "3.6"
-#  - "3.7-dev"
-
-notifications:
-  email:
-    - rfkelly@mozilla.com
-  irc:
-    channels:
-      - "irc.mozilla.org#services-dev"
-    use_notice: false
-    skip_join: false
-
-install:
-  - pip install virtualenv
-  - make build
-
-script:
-  - make test