diff --git a/tests/test-queries b/tests/test-queries
index f8b0f51..3383ef2 100755
--- a/tests/test-queries
+++ b/tests/test-queries
@@ -28,6 +28,10 @@ main() {
   root=$(readlink -f "$root")
   cd "$root"
 
+  if [ ! -d "$root"/tests/queries ]; then
+    "$root"/tests/create-queries-from-templates
+  fi
+
   find_cmd=(find tests/queries -type f -name '*.sql')
   debug=0
   if [ -n "${1:-""}" ]; then