diff --git a/queries/highlights.scm b/queries/highlights.scm
new file mode 100644
index 0000000..2135031
--- /dev/null
+++ b/queries/highlights.scm
@@ -0,0 +1,3 @@
+(comment) @comment
+
+; vim: sw=2 foldmethod=marker
diff --git a/test/highlight/comment.tig b/test/highlight/comment.tig
new file mode 100644
index 0000000..b0e8262
--- /dev/null
+++ b/test/highlight/comment.tig
@@ -0,0 +1,5 @@
+/* This is /* a nested */ comment */
+/* <- comment
+            ^ comment
+                                ^ comment
+ */