diff --git a/README.md b/README.md
index 2b0abe80e..583af12c8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # Auth0 Java
 
-[![Build][travis-ci-badge]][travis-ci-url]
+[![Build-Circle][circle-ci-badge]][circle-ci-url]
+[![Build-Travis][travis-ci-badge]][travis-ci-url]
 [![MIT][mit-badge]][mit-url]
 [![Maven][maven-badge]][maven-url]
 [![JCenter][jcenter-badge]][jcenter-url]
@@ -503,6 +504,8 @@ This project is licensed under the MIT license. See the [LICENSE](LICENSE) file
 
 <!-- Vars -->
 
+[circle-ci-badge]: https://img.shields.io/circleci/project/github/auth0/auth0-java.svg?style=flat
+[circle-ci-url]: https://circleci.com/gh/auth0/auth0-java/tree/master
 [travis-ci-badge]: https://travis-ci.org/auth0/auth0-java.svg?branch=master
 [travis-ci-url]: https://travis-ci.org/auth0/auth0-java
 [mit-badge]: http://img.shields.io/:license-mit-blue.svg?style=flat
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 000000000..07d14f094
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,20 @@
+#
+# Build configuration for Circle CI
+#
+
+machine:
+    environment:
+        GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
+        _JAVA_OPTIONS: "-Xms512m -Xmx1024m"
+    java:
+        version: oraclejdk7
+
+dependencies:
+    cache_directories:
+        - ~/.gradle
+
+test:
+    override:
+        - ./gradlew clean check jacocoTestReport --continue --console=plain
+    post:
+        - bash <(curl -s https://codecov.io/bash)