diff --git a/queries/cpp/indents.scm b/queries/cpp/indents.scm
index 7df9aea0c..6faa6f144 100644
--- a/queries/cpp/indents.scm
+++ b/queries/cpp/indents.scm
@@ -1,11 +1,9 @@
 ; inherits: c
 
 [
-  (class_specifier)
   (condition_clause)
 ] @indent.begin
 
 ((field_initializer_list) @indent.begin
   (#set! indent.start_at_same_line 1))
 (access_specifier) @indent.branch
-
diff --git a/tests/indent/cpp/class_newline.cpp b/tests/indent/cpp/class_newline.cpp
new file mode 100644
index 000000000..084d3026b
--- /dev/null
+++ b/tests/indent/cpp/class_newline.cpp
@@ -0,0 +1,9 @@
+class Foo
+{
+    int x;
+    class Bar
+    {
+        int y;
+    };
+    Bar z;
+};