diff --git a/Makefile b/Makefile
index 8d8e2f078a..ddf0c548af 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ deps:
 	@echo $(DEPS) | xargs -n1 go get -d
 
 test: deps
+	./scripts/verify_no_uuid.sh
 	go list ./... | xargs -n1 go test
 
 integ:
diff --git a/scripts/verify_no_uuid.sh b/scripts/verify_no_uuid.sh
new file mode 100755
index 0000000000..228bd652b7
--- /dev/null
+++ b/scripts/verify_no_uuid.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+grep generateUUID consul/state_store.go
+RESULT=$?
+
+if [ $RESULT -eq 0 ]; then
+    exit 1
+fi