diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29efdf69..330d6241 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,10 +7,18 @@ Features:
   - Use Puma instead of unicorn
   - Gets ruby version from http://ruby.platan.us/latest
   - Adds the install command
-  - Adds heroku buildpack support using the [multi buildpack](http://github.com/ddollar/heroku-buildpack-multi)
+  - Adds heroku buildpack support using the [multi buildpack](multi-buildpack)
   - Adds `rack-timeout` to prevent long running requests
-  - Adds [deploy-tasks buildpack](http://github.com/gunpowderlabs/buildpack-ruby-rake-deploy-tasks) mainly to perform migrations, [#39](http://github.com/platanus/potassium/pull/39)
-  - Add Delayed Jobs to handle background processes [#41]
+  - Adds [deploy-tasks buildpack](deploy-tasks) mainly to perform migrations, [#39]
+  - Add Delayed Jobs to handle background processes, [#41]
+  - Adds continuous integration using [CircleCI](https://circleci.com)
+  and docker, [#51]
+
+[multi-buildpack]: http://github.com/ddollar/heroku-buildpack-multi
+[deploy-tasts]: http://github.com/gunpowderlabs/buildpack-ruby-rake-deploy-tasks
+[#39]: http://github.com/platanus/potassium/pull/39
+[#41]: http://github.com/platanus/potassium/pull/41
+[#51]: http://github.com/platanus/potassium/pull/51
 
 ## 1.3
 
diff --git a/README.md b/README.md
index ab6bd0e1..10afd007 100644
--- a/README.md
+++ b/README.md
@@ -77,6 +77,8 @@ When you choose to deploy to heroku a few extra things are added for the project
   to configure the app to log to standard out,
   which is how [Heroku's logging][heroku-logging] works.
 - Adds a [Procfile][procfile] to define the processes to run in heroku
+- Setup continuous integration in [CircleCI](circle-ci) to run tests. It use
+  docker to maintain better parity between testing and production environments
 - Adds a `.buildpacks` file with the default buildpacks to use. It use the
   following buildpacks:
 
@@ -97,6 +99,7 @@ When you choose to deploy to heroku a few extra things are added for the project
 [heroku-buildpack-ruby]: http://github.com/heroku/heroku-buildpack-ruby
 [heroku-buildpack-multi]: http://github.com/ddollar/heroku-buildpack-multi
 [buildpack-deploy-tasks]: http://github.com/gunpowderlabs/buildpack-ruby-rake-deploy-tasks
+[circle-ci]: https://circleci.com
 
 ## Contributing