diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..648ac67bd
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,23 @@
+version: 2
+executorType: machine
+stages:
+  build:
+    parallel: 6
+    workdir: /home/circleci/project
+    environment:
+      - FOO: "bar"
+    steps:
+      - type: checkout
+      - type: shell
+        command:
+          - run: curl -L https://github.com/docker/compose/releases/download/1.22.0/docker-compose-`uname -s`-`uname -m` > docker-compose
+          - run: chmod +x docker-compose
+          - run: sudo mv docker-compose /usr/local/bin
+          - run: mv travis.env .env
+          - run: sudo docker-compose run web bundle install
+          - run: sudo docker-compose run web npm install
+          - run: sudo docker-compose run web bundle exec rails db:setup
+          - run: sudo docker-compose run web rake keys:generate
+          - run: sudo docker-compose run web rspec spec
+          - run: sudo docker-compose run webpack sh run_js_build.sh
+
diff --git a/.travis.yml b/.travis.yml
index b66781e47..5e1c2f71b 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,13 +8,12 @@
 sudo:     required
 env:
   global:
-    - DOCKER_COMPOSE_VERSION=1.22.0
+    - DOCKER_COMPOSE_VERSION=
 install:
-  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - curl -L https://github.com/docker/compose/releases/download/1.22.0/docker-compose-`uname -s`-`uname -m` > docker-compose
   - chmod +x docker-compose
   - sudo mv docker-compose /usr/local/bin
   - mv travis.env .env
-before_script:
   - sudo docker-compose run web bundle install
   - sudo docker-compose run web npm install
   - sudo docker-compose run web bundle exec rails db:setup