diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..a3a8e6d
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,36 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: ubuntu:14.04
+      - image: redis:5.0.5-alpine
+
+    working_directory: ~/webdis
+
+    steps:
+      - checkout
+
+      # Build & run
+      - run: |
+          apt-get -y update &&
+          apt-get -y upgrade &&
+          apt-get -y --force-yes install wget make gcc libevent-dev libmsgpack-dev &&
+          make &&
+          sed -i -e 's/"daemonize":.*true,/"daemonize": false,/g' webdis.json &&
+          ./webdis
+
+      # Run tests
+      - run: |
+          mkdir /tmp/artifacts &&
+          ./tests/basic.py 2>&1 > /tmp/artifacts/test-out.txt 
+
+      # Save artifacts
+      - store_artifacts:
+          path: /tmp/artifacts
+          destination: build
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - build