diff --git a/Makefile b/Makefile
index 03f186ac9..b3e91cea7 100644
--- a/Makefile
+++ b/Makefile
@@ -106,8 +106,7 @@ clean:
 ifeq ($(BUILD_IN_CONTAINER),true)
 tests:
 	$(SUDO) docker run $(RM) -v $(shell pwd):/go/src/github.com/weaveworks/scope \
-		-e GOARCH -e GOOS -e CIRCLECI --entrypoint=/bin/sh $(SCOPE_BACKEND_BUILD_IMAGE) -c \
-		"cd /go/src/github.com/weaveworks/scope && ./tools/test -no-go-get"
+		-e GOARCH -e GOOS -e CIRCLECI $(SCOPE_BACKEND_BUILD_IMAGE) tests
 else
 tests:
 	./tools/test -no-go-get
diff --git a/bin/release b/bin/release
index 838ea8ccc..053498f2f 100755
--- a/bin/release
+++ b/bin/release
@@ -91,7 +91,7 @@ build() {
     sed -i "/SCRIPT_VERSION=/ c\SCRIPT_VERSION=\"$VERSION\"" ./scope
     make SUDO=$SUDO SCOPE_VERSION=$VERSION DOCKERHUB_USER=$DOCKERHUB_USER
 
-    if $(go list -e -f {{.Dir}} github.com/weaveworks/tools)/test; then
+    if make tests; then
         echo -e '\u2713 Tests pass'
     else
         echo -e "\u2757 Tests failed, probably best not publish this one" >&2