diff --git a/runtime/queries/hare/textobjects.scm b/runtime/queries/hare/textobjects.scm
new file mode 100644
index 00000000..de06f799
--- /dev/null
+++ b/runtime/queries/hare/textobjects.scm
@@ -0,0 +1,23 @@
+(function_declaration) @function.around
+
+(function_declaration
+  body: (_) @function.inside)
+
+(function_declaration
+  (fndec_attrs
+    (fndec_attr "@test"))) @test.around
+
+(function_declaration
+  (fndec_attrs
+    (fndec_attr "@test"))
+  body: (_) @test.inside)
+
+(parameter) @parameter.around
+
+(switch_case) @parameter.around
+
+(comment) @comment.inside
+
+(comment)+ @comment.around
+
+(type_declaration) @class.around