diff --git a/queries/highlights.scm b/queries/highlights.scm
new file mode 100644
index 0000000..f24958e
--- /dev/null
+++ b/queries/highlights.scm
@@ -0,0 +1,6 @@
+[
+ (line_comment)
+ (block_comment)
+] @comment
+
+; vim: sw=2 foldmethod=marker
diff --git a/test/highlight/comments.bp b/test/highlight/comments.bp
new file mode 100644
index 0000000..6e93dc9
--- /dev/null
+++ b/test/highlight/comments.bp
@@ -0,0 +1,10 @@
+/* This is comment             */
+/* <- comment
+            ^ comment
+                                ^ comment
+ */
+// And another comment
+/* <- comment
+            ^ comment
+                     ^ comment
+ */