diff --git a/CHANGELOG.md b/CHANGELOG.md
index 717642528048cb0ad24e8edfd6308a77278e13dc..7d66ee661ad7e20d6a06ad8117e3195e5389d223 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -79,6 +79,7 @@ be deprecated eventually.
 - [#2705](https://github.com/influxdata/telegraf/pull/2705): Kinesis output: add use_random_partitionkey option
 - [#2635](https://github.com/influxdata/telegraf/issues/2635): add tcp keep-alive to socket_listener & socket_writer
 - [#2031](https://github.com/influxdata/telegraf/pull/2031): Add Kapacitor input plugin
+- [#2732](https://github.com/influxdata/telegraf/pull/2732): Use go 1.8.1
 
 ### Bugfixes
 
diff --git a/circle.yml b/circle.yml
index a7d15368d5c8729d20b04e6b6d6ff0b5a1fe2cee..3982c1036c627977dbb49f8848ccdfcaa371de6a 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,13 +1,11 @@
 machine:
+  go:
+    version: 1.8.1
   services:
     - docker
-  post:
-    - sudo service zookeeper stop
-    - go version
-    - sudo rm -rf /usr/local/go
-    - wget https://storage.googleapis.com/golang/go1.8.linux-amd64.tar.gz
-    - sudo tar -C /usr/local -xzf go1.8.linux-amd64.tar.gz
-    - go version
+    - memcached
+    - redis
+    - rabbitmq-server
 
 dependencies:
   override: