diff --git a/test.sh b/test.sh
index 5d7e7b2..8cd4c12 100755
--- a/test.sh
+++ b/test.sh
@@ -82,3 +82,11 @@ GXADMIN=./.tmpgxadmin
 	fi
 	[ "$result" -eq 0 ]
 }
+
+@test "Ensure query names are standardised and match [type]_q-u-e-r-y" {
+	result=$(grep -P '^[a-z]+_[a-z-]*_[a-z-_]*\(\)' ${GXADMIN} -c)
+	if (( result > 20 )); then
+		grep -P '^[a-z]+_[a-z-]*_[a-z-_]*\(\)' parts/2*
+	fi
+	[ "$result" -eq 20 ]
+}