diff --git a/.lintignore b/.lintignore
new file mode 100644
index 0000000000..3403a0d123
--- /dev/null
+++ b/.lintignore
@@ -0,0 +1,8 @@
+# IMPORTANT: Please only use GLOBs to ignore files and directories.
+
+# Do not lint any bash script in Weave Net, in order to 
+# avoid breaking the build on make lint:
+*.sh
+bin/*
+prog/weaveexec/symlink
+weave
diff --git a/Makefile b/Makefile
index 1af0eccd24..27ea6832a4 100644
--- a/Makefile
+++ b/Makefile
@@ -176,7 +176,7 @@ exes $(EXES) tests lint: $(BUILD_UPTODATE)
 	$(SUDO) docker run $(RM) $(RUN_FLAGS) \
 	    -v $(shell pwd):/go/src/github.com/weaveworks/weave \
 		-v $(shell pwd)/.pkg:/go/pkg \
-		-e GOARCH=$(ARCH) -e CGO_ENABLED=1 -e GOOS=linux -e CIRCLECI -e CIRCLE_BUILD_NUM -e CIRCLE_NODE_TOTAL -e CIRCLE_NODE_INDEX -e COVERDIR -e SLOW \
+		-e GOARCH=$(ARCH) -e CGO_ENABLED=1 -e GOOS=linux -e CIRCLECI -e CIRCLE_BUILD_NUM -e CIRCLE_NODE_TOTAL -e CIRCLE_NODE_INDEX -e COVERDIR -e SLOW -e DEBUG \
 		$(BUILD_IMAGE) COVERAGE=$(COVERAGE) WEAVE_VERSION=$(WEAVE_VERSION) CC=$(CC) QEMUARCH=$(QEMUARCH) CGO_LDFLAGS=$(CGO_LDFLAGS) $@
 
 else
@@ -210,7 +210,7 @@ $(SIGPROXY_EXE) $(TEST_TLS_EXE) $(WEAVEWAIT_NOOP_EXE) $(RUNNER_EXE):
 	go build $(BUILD_FLAGS) -o $@ ./$(@D)
 
 tests:
-	./tools/test -no-go-get
+	./tools/test -no-go-get -netgo -timeout 8m
 
 lint:
 	./tools/lint -nocomment -notestpackage .
diff --git a/bin/circle-test-unit b/bin/circle-test-unit
index b9c98eb4c9..b9ac9a5dc1 100755
--- a/bin/circle-test-unit
+++ b/bin/circle-test-unit
@@ -6,6 +6,6 @@ source "$STATE"
 
 if [ -n "$TEST_AND_PUBLISH" ] ; then
     cd $SRCDIR
-    make lint
+    make DEBUG=1 lint
     COVERDIR=test/coverage make RM= tests
 fi
diff --git a/tools b/tools
index 48beb60bbe..a59884f322 160000
--- a/tools
+++ b/tools
@@ -1 +1 @@
-Subproject commit 48beb60bbebb6511b8c41fb339f48dc97505966e
+Subproject commit a59884f322173264bc088549899cad51a51d0a87