diff --git a/components/cli/Makefile b/components/cli/Makefile
index 19ef173ee1..017cb55006 100644
--- a/components/cli/Makefile
+++ b/components/cli/Makefile
@@ -26,3 +26,13 @@ cross: clean
 	@gox -output build/docker-{{.OS}}-{{.Arch}} \
 		 -osarch="linux/arm linux/amd64 darwin/amd64 windows/amd64" \
 		 github.com/docker/cli/cmd/docker
+
+vendor: vendor.conf
+	@vndr 2> /dev/null
+	@if [ "`git status --porcelain -- vendor 2>/dev/nul`" ]; then \
+		echo; echo "vendoring is wrong. These files were changed:"; \
+		echo; git status --porcelain -- vendor 2>/dev/nul; \
+		echo; exit 1; \
+	fi;
+
+ci: cross test
diff --git a/components/cli/circle.yml b/components/cli/circle.yml
index 29fd13c3ba..e6fedd44d4 100644
--- a/components/cli/circle.yml
+++ b/components/cli/circle.yml
@@ -7,11 +7,17 @@ jobs:
     steps:
       - checkout
       - setup_remote_docker
-      - run: 
-          name: "Lint"          
+      - run:
+          name: "Lint"
           command: |
             docker build -f dockerfiles/Dockerfile.lint --tag cli-linter .
             docker run cli-linter
       - run:
           name: "Build and Unit Test"
-          command: docker build -f dockerfiles/Dockerfile.ci .
+          command: |
+            docker build -f dockerfiles/Dockerfile.ci --tag cli-builder .
+            docker run cli-builder
+      - run:
+          name: "Vendor"
+          command: |
+            docker run cli-builder make vendor
diff --git a/components/cli/dockerfiles/Dockerfile.ci b/components/cli/dockerfiles/Dockerfile.ci
index 29918badab..0dd14ee192 100644
--- a/components/cli/dockerfiles/Dockerfile.ci
+++ b/components/cli/dockerfiles/Dockerfile.ci
@@ -24,7 +24,4 @@ COPY    . /go/src/github.com/docker/cli
 ENV     CGO_ENABLED=0
 WORKDIR /go/src/github.com/docker/cli
 
-RUN     make cross
-RUN     make test
-
-CMD     sh
+CMD     ["make", "ci"]