diff --git a/Makefile b/Makefile
index 4d24a34c1..db312b063 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ install:
 
 # run all validation tests
 .PHONY: validate
-validate: gofmt check-vendor vet validate-vendor-licenses sec #lint
+validate: gofmt check-fit check-vendor vet validate-vendor-licenses sec #lint
 
 .PHONY: gofmt
 gofmt:
@@ -60,6 +60,10 @@ gofmt:
 check-vendor:
 	./scripts/check-vendor.sh
 
+.PHONY: check-fit
+check-fit:
+	./scripts/check-fit.sh
+
 .PHONY: validate-vendor-licenses
 validate-vendor-licenses:
 	wwhrd check -q
diff --git a/scripts/check-fit.sh b/scripts/check-fit.sh
new file mode 100755
index 000000000..64f2e5b84
--- /dev/null
+++ b/scripts/check-fit.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+if grep -nr "FIt(" tests/; then
+  echo "Not OK. FIt exists somewhere in the testing code. Please remove it."
+  exit 1
+else
+  echo "OK"
+fi