diff --git a/queries/ql/indents.scm b/queries/ql/indents.scm
index c877ba653..8e5831738 100644
--- a/queries/ql/indents.scm
+++ b/queries/ql/indents.scm
@@ -1,19 +1,19 @@
 [
-  (moduleMember)
+  (module)
   (dataclass)
-  (charpred)
-  (memberPredicate)
+  (classMember)
+  (classlessPredicate)
   (quantified)
 ] @indent
 
 [
-  (variable)
-  "("
   ")"
-  "{"
   "}"
-  "["
-  "]"
+] @indent_end
+
+[
+  ")"
+  "}"
 ] @branch
 
 [
diff --git a/tests/indent/ql/module.ql b/tests/indent/ql/module.ql
index 128772b33..caaa44318 100644
--- a/tests/indent/ql/module.ql
+++ b/tests/indent/ql/module.ql
@@ -1,6 +1,7 @@
 import go
 
 module Test {
+  predicate test() {}
 }
 
 select 1
diff --git a/tests/indent/ql_spec.lua b/tests/indent/ql_spec.lua
index d68bb3e5d..cc648091e 100644
--- a/tests/indent/ql_spec.lua
+++ b/tests/indent/ql_spec.lua
@@ -16,5 +16,9 @@ describe("indent Lua:", function()
 end)
 
 describe("new line:", function()
-  run:new_line("module.ql", { on_line = 3, text = "predicate test() {}", indent = 2 })
+  run:new_line("module.ql", { on_line = 3, text = "predicate foo() {}", indent = 2 })
+end)
+
+describe("new line:", function()
+  run:new_line("module.ql", { on_line = 4, text = "predicate foo() {}", indent = 2 })
 end)