diff --git a/Makefile b/Makefile
index a9092c8..ecc757e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,5 @@
 bin/assume-role: *.go
 	go build -o bin/assume-role .
+
+test:
+	go test -race $(shell go list ./... | grep -v /vendor/)
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 0000000..b4e8de5
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,14 @@
+machine:
+  environment:
+    GODIST: "go1.7.linux-amd64.tar.gz"
+  post:
+    - mkdir -p download
+    - test -e download/$GODIST || curl -o download/$GODIST https://storage.googleapis.com/golang/$GODIST
+    - sudo rm -rf /usr/local/go
+    - sudo tar -C /usr/local -xzf download/$GODIST
+    - sudo ln -s /usr/local/go/bin/go /usr/bin/go
+    - sudo go install -a -race std
+
+test:
+  override:
+    - make test