diff --git a/Makefile b/Makefile
index 5cad804c5..3523b7878 100644
--- a/Makefile
+++ b/Makefile
@@ -170,12 +170,12 @@ ui-upload: client/build-external/index.html
 ui-build-pkg:
 	AWS_ACCESS_KEY_ID=$$UI_BUCKET_KEY_ID \
 	AWS_SECRET_ACCESS_KEY=$$UI_BUCKET_KEY_SECRET \
-	$(sudo) docker run \
+	$(sudo) docker run --name scope-pkg \
 	-v $(shell pwd)/client/:/home/weave \
 	-v $(shell pwd)/tmp:/home/weave/tmp \
 	$(SCOPE_UI_BUILD_IMAGE) \
 	npm run bundle && \
-	aws s3 cp ./tmp/weave-scope.tgz s3://weaveworks-js-modules/weave-scope/ --acl public-read
+	aws s3 cp ./tmp/weave-scope.tgz s3://weaveworks-js-modules/weave-scope/weave-scope.tgz --acl public-read
 
 clean:
 	$(GO) clean ./...
diff --git a/circle.yml b/circle.yml
index 1d0158764..5a4cfabdd 100644
--- a/circle.yml
+++ b/circle.yml
@@ -39,12 +39,12 @@ dependencies:
 
 test:
   override:
-    - cd $SRCDIR; make RM= lint:
-        parallel: true
+    # - cd $SRCDIR; make RM= lint:
+    #     parallel: true
     # - cd $SRCDIR; COVERDIR=./coverage make RM= tests:
     #     parallel: true
-    # - cd $SRCDIR; make RM= client-test static:
-    #     parallel: true
+    - cd $SRCDIR; make RM= client-test static:
+        parallel: true
     # - cd $SRCDIR; make RM= client-lint static:
     #     parallel: true
     # - cd $SRCDIR; rm -f prog/scope; if [ "$CIRCLE_NODE_INDEX" = "0" ]; then GOARCH=arm make GO_BUILD_INSTALL_DEPS= RM= prog/scope; else GOOS=darwin make GO_BUILD_INSTALL_DEPS= RM= prog/scope; fi: