diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..6242fcc
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,14 @@
+# Golang CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-go/ for more details
+version: 2
+jobs:
+  build:
+    docker:
+      - image: circleci/golang:1.10-stretch
+
+    working_directory: /go/src/github.com/DCSO/fluxline
+    steps:
+      - checkout
+      - run: go get -v -t -d ./...
+      - run: go test -v ./...
diff --git a/README.md b/README.md
index 956dab9..c0af39c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# fluxline
+# fluxline [![CircleCI](https://circleci.com/gh/DCSO/fluxline.svg?style=shield)](https://circleci.com/gh/DCSO/fluxline) [![Documentation](https://godoc.org/github.com/DCSO/fluxline?status.svg)](http://godoc.org/github.com/DCSO/fluxline)
 
 Encoder for Golang to prepare sets of metrics in [InfluxDB's Line Protocol](https://docs.influxdata.com/influxdb/v1.4/write_protocols/line_protocol_reference) format. As input, we use structs annotated with the `influx` tag, similar to how `encoding/json` works.