diff --git a/Makefile b/Makefile
index 7978b632ca..b60b2a4d00 100644
--- a/Makefile
+++ b/Makefile
@@ -77,7 +77,7 @@ test-docker-py: build
 	$(DOCKER_RUN_DOCKER) hack/make.sh binary test-docker-py
 
 validate: build
-	$(DOCKER_RUN_DOCKER) hack/make.sh validate-dco validate-gofmt validate-toml validate-vet
+	$(DOCKER_RUN_DOCKER) hack/make.sh validate-dco validate-gofmt validate-test validate-toml validate-vet
 
 shell: build
 	$(DOCKER_RUN_DOCKER) bash
diff --git a/hack/make.sh b/hack/make.sh
index eeb26cbce0..31e08cd376 100755
--- a/hack/make.sh
+++ b/hack/make.sh
@@ -46,6 +46,7 @@ echo
 DEFAULT_BUNDLES=(
 	validate-dco
 	validate-gofmt
+	validate-test
 	validate-toml
 	validate-vet
 
diff --git a/hack/make/validate-test b/hack/make/validate-test
new file mode 100644
index 0000000000..d9d05f3bea
--- /dev/null
+++ b/hack/make/validate-test
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# Make sure we're not using gos' Testing package any more in integration-cli
+
+source "${MAKEDIR}/.validate"
+
+IFS=$'\n'
+files=( $(validate_diff --diff-filter=ACMR --name-only -- 'integration-cli/*.go' || true) )
+unset IFS
+
+badFiles=()
+for f in "${files[@]}"; do
+	# skip check_test.go since it *does* use the testing package
+	if [ "$f" = "integration-cli/check_test.go" ]; then
+		continue
+	fi
+
+	# we use "git show" here to validate that what's committed is formatted
+	if git show "$VALIDATE_HEAD:$f" | grep -q testing.T; then
+		badFiles+=( "$f" )
+	fi
+done
+
+if [ ${#badFiles[@]} -eq 0 ]; then
+	echo 'Congratulations! No testing.T found.'
+else
+	{
+		echo "These files use the wrong testing infrastructure:"
+		for f in "${badFiles[@]}"; do
+			echo " - $f"
+		done
+		echo
+	} >&2
+	false
+fi
diff --git a/integration-cli/check_test.go b/integration-cli/check_test.go
index 330bc373b5..07bb931596 100644
--- a/integration-cli/check_test.go
+++ b/integration-cli/check_test.go
@@ -8,7 +8,9 @@ import (
 	"github.com/go-check/check"
 )
 
-func Test(t *testing.T) { check.TestingT(t) }
+func Test(t *testing.T) {
+	check.TestingT(t)
+}
 
 type TimerSuite struct {
 	start time.Time