diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..49acb091
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,20 @@
+.PHONEY: all test install get_vendor_deps ensure_tools
+
+GOTOOLS = \
+	github.com/Masterminds/glide
+REPO:=github.com/tendermint/tmlibs
+
+all: install test
+
+test:
+	go test `glide novendor`
+
+get_vendor_deps: ensure_tools
+	@rm -rf vendor/
+	@echo "--> Running glide install"
+	@glide install
+
+ensure_tools:
+	go get $(GOTOOLS)
+
+
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 00000000..23ac4bd9
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,21 @@
+machine:
+  environment:
+    GOPATH: /home/ubuntu/.go_workspace
+    PROJECT_PARENT_PATH: "$GOPATH/src/github.com/$CIRCLE_PROJECT_USERNAME"
+    PROJECT_PATH: $GOPATH/src/github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME
+    GO15VENDOREXPERIMENT: 1
+  hosts:
+    circlehost: 127.0.0.1
+    localhost: 127.0.0.1
+
+dependencies:
+  override:
+    - mkdir -p "$PROJECT_PARENT_PATH"
+    - ln -sf "$HOME/$CIRCLE_PROJECT_REPONAME/" "$PROJECT_PATH"
+  post:
+    - go version
+
+test:
+  override:
+    - "go version"
+    - "cd $PROJECT_PATH && make get_vendor_deps && make test"