diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000000..aec70f3055
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,72 @@
+version: 2
+jobs:
+  test:
+    working_directory: /go/src/github.com/Azure/acs-engine
+    docker:
+      - image: microsoft/acs-engine:latest
+    steps:
+      - setup_remote_docker:
+          reusable: true
+      - checkout
+      - run:
+          name: Build current image
+          command: |
+            TAG="0.1.${CIRCLE_BUILD_NUM}"
+            docker build -t microsoft/acs-engine:$TAG .
+      - run:
+          name: Run style and unit tests
+          command: docker run --rm microsoft/acs-engine:$TAG make test-style build test
+      - run:
+          name: Generate test coverage results
+          command: make bootstrap build coverage
+          command: docker run --rm microsoft/acs-engine:$TAG make build coverage
+  e2e:
+    working_directory: /go/src/github.com/Azure/acs-engine
+    docker:
+      - image: microsoft/acs-engine:latest
+    steps:
+      - setup_remote_docker:
+          reusable: true
+      - checkout
+      - run:
+          name: Build current image
+          command: |
+            TAG="0.1.${CIRCLE_BUILD_NUM}"
+            docker build -t microsoft/acs-engine:$TAG .
+      - run:
+          name: e2e tests
+          command: |
+            TAG="0.1.${CIRCLE_BUILD_NUM}"
+            cat > ./env.list <<END
+            BUILD_NUMBER=${CIRCLE_BUILD_NUM}
+            RESOURCE_GROUP_PREFIX=y
+            SKIP_METRICS=y
+
+            SERVICE_PRINCIPAL_CLIENT_ID=${SERVICE_PRINCIPAL_CLIENT_ID}
+            SERVICE_PRINCIPAL_CLIENT_SECRET=${SERVICE_PRINCIPAL_CLIENT_SECRET}
+            TENANT_ID=${TENANT_ID}
+            SUBSCRIPTION_ID=${SUBSCRIPTION_ID}
+            CLUSTER_SERVICE_PRINCIPAL_CLIENT_ID=${CLUSTER_SERVICE_PRINCIPAL_CLIENT_ID}
+            CLUSTER_SERVICE_PRINCIPAL_CLIENT_SECRET=${CLUSTER_SERVICE_PRINCIPAL_CLIENT_SECRET}
+            CERT_KEYVAULT_ID=${CERT_KEYVAULT_ID}
+            CERT_SECRET_URL=${CERT_SECRET_URL}
+            COVERALLS_TOKEN=${COVERALLS_TOKEN}
+
+            STAGE_TIMEOUT_MIN=30
+            NUM_OF_RETRIES=2
+            TEST_CONFIG=test/acse-conf/acse-pr.json
+            END
+            docker run --rm --env-file ./env.list microsoft/acs-engine:$TAG make build test-e2e
+
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - test
+      - e2e-hold:
+          type: approval
+          requires:
+            - test
+      - e2e:
+          requires:
+            - e2e-hold
diff --git a/.dockerignore b/.dockerignore
index e4a98cc42c..046b83d286 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,4 +2,7 @@
 ./acs-engine.exe
 ./_output
 ./.git
-./test/acs-engine-test/acs-engine-test
\ No newline at end of file
+./test/acs-engine-test/acs-engine-test
+## autogenerated
+./pkg/i18n/translations.go
+./pkg/acsengine/templates.go
diff --git a/Dockerfile b/Dockerfile
index c6b2d4f5e8..10c97f720b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,7 +34,10 @@ RUN git clone https://github.com/akesterson/cmdarg.git /tmp/cmdarg \
 RUN git clone https://github.com/akesterson/shunit.git /tmp/shunit \
     && cd /tmp/shunit && make install && rm -rf /tmp/shunit
 
-# Used by some CI jobs
-ADD ./test/bootstrap/checkout-pr.sh /tmp/checkout-pr.sh
-
 WORKDIR /gopath/src/github.com/Azure/acs-engine
+
+# Cache vendor layer where possible
+ADD Makefile versioning.mk glide.yaml glide.lock /gopath/src/github.com/Azure/acs-engine/
+RUN make bootstrap
+
+ADD . /gopath/src/github.com/Azure/acs-engine
diff --git a/Makefile b/Makefile
index 1bed226944..e4fd5a9827 100644
--- a/Makefile
+++ b/Makefile
@@ -58,13 +58,17 @@ checksum:
 clean:
 	@rm -rf $(BINDIR) ./_dist
 
-test: test_fmt
+test: test-style
 	go test -v $(GOFILES)
 
 .PHONY: test-style
 test-style:
 	@scripts/validate-go.sh
 
+.PHONY: test-e2e
+test-e2e:
+	@test/e2e.sh
+
 HAS_GLIDE := $(shell command -v glide;)
 HAS_GOX := $(shell command -v gox;)
 HAS_GIT := $(shell command -v git;)
diff --git a/test/acs-engine-test.sh b/test/e2e.sh
similarity index 98%
rename from test/acs-engine-test.sh
rename to test/e2e.sh
index 96c2929356..badb03bd3f 100755
--- a/test/acs-engine-test.sh
+++ b/test/e2e.sh
@@ -25,6 +25,4 @@ ROOT="${DIR}/.."
 [[ ! -z "${CLUSTER_SERVICE_PRINCIPAL_CLIENT_SECRET:-}" ]] || (echo "Must specify CLUSTER_SERVICE_PRINCIPAL_CLIENT_SECRET" && exit -1)
 [[ ! -z "${STAGE_TIMEOUT_MIN:-}" ]]                       || (echo "Must specify STAGE_TIMEOUT_MIN" && exit -1)
 
-make -C "${ROOT}" ci
-
 ${ROOT}/test/acs-engine-test/acs-engine-test -c ${TEST_CONFIG:-${ROOT}/test/acs-engine-test/acs-engine-test.json} -d ${ROOT}