diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 17a1306..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-language: node_js
-node_js: stable
-firefox: "39.0"
-before_script:
-  - "npm install -g bower"
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
diff --git a/README.md b/README.md
index 8dd1138..3994e6f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# riot-form [![Build Status](https://travis-ci.org/claudetech/riot-form.svg?branch=master)](https://travis-ci.org/claudetech/riot-form)
+# riot-form [![CircleCI](https://circleci.com/gh/claudetech/riot-form/tree/master.svg?style=svg)](https://circleci.com/gh/claudetech/riot-form/tree/master)
 
 Easy forms for [riotjs](http://riotjs.com/).
 
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 0000000..43d7ff7
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,20 @@
+machine:
+  node:
+    version: v6.1.0
+  environment:
+    PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin"
+
+dependencies:
+  pre:
+    - wget -O geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/v0.16.1/geckodriver-v0.16.1-linux64.tar.gz
+    - gunzip -c geckodriver.tar.gz | tar xopf -
+    - chmod +x geckodriver && mv geckodriver /home/ubuntu/bin/
+
+  override:
+    - yarn
+  cache_directories:
+    - ~/.cache/yarn
+
+test:
+  override:
+    - yarn test