diff --git a/README.md b/README.md
index 2efeb891..302a59c9 100644
--- a/README.md
+++ b/README.md
@@ -146,7 +146,7 @@ Note: support for specific languages is strictly community maintained and can br
   - [ ] `json5`
   - [ ] `jsonc`
   - [ ] `jsx`
-  - [ ] `kdl`
+  - [x] `kdl`
   - [ ] `kotlin`
   - [ ] `lalrpop`
   - [ ] `ledger`
diff --git a/queries/kdl/context.scm b/queries/kdl/context.scm
new file mode 100644
index 00000000..5d7efbdd
--- /dev/null
+++ b/queries/kdl/context.scm
@@ -0,0 +1 @@
+(node_children) @context
diff --git a/test/lang/test.kdl b/test/lang/test.kdl
new file mode 100644
index 00000000..2309f01f
--- /dev/null
+++ b/test/lang/test.kdl
@@ -0,0 +1,98 @@
+// {{TEST}}
+
+foo { // {{CONTEXT}}
+    bar { // {{CONTEXT}}
+        baz { // {{CONTEXT}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            // {{CURSOR}}
+        }
+    }
+}
+
+// {{TEST}}
+
+bar { // {{CONTEXT}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// {{CURSOR}}
+}