diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm
index 8dcbaeff5..d29c34af3 100644
--- a/queries/cpp/highlights.scm
+++ b/queries/cpp/highlights.scm
@@ -174,10 +174,9 @@
  ;"xor_eq"
 ] @keyword.operator
 
-[
-  "<=>"
-  "::"
-] @operator
+"<=>" @operator
+
+"::" @punctuation.delimiter
 
 (attribute_declaration) @attribute
 
diff --git a/tests/query/highlights/cpp/test.cpp b/tests/query/highlights/cpp/test.cpp
index f0c3f62bf..0a13956fa 100644
--- a/tests/query/highlights/cpp/test.cpp
+++ b/tests/query/highlights/cpp/test.cpp
@@ -10,6 +10,7 @@ auto main( int argc, char** argv ) -> int
       //                  ^ operator
 {
     std::cout << "Hello world!" << std::endl;
+    //  ^ punctuation.delimiter
     
     return EXIT_SUCCESS;
     // ^ keyword.return