diff --git a/src/6PBE.yaml b/src/6PBE.yaml
index 39edcf92..559e7bdb 100644
--- a/src/6PBE.yaml
+++ b/src/6PBE.yaml
@@ -1,7 +1,7 @@
 ---
 - name: Zero-indented sequences in explicit mapping keys
   from: '@perlpunk'
-  tags: explicit-key mapping sequence
+  tags: explicit-key mapping sequence complex-key
   yaml: |
     ---
     ?
diff --git a/src/9MMW.yaml b/src/9MMW.yaml
index f887d5e2..27c913b1 100644
--- a/src/9MMW.yaml
+++ b/src/9MMW.yaml
@@ -1,7 +1,7 @@
 ---
 - name: Single Pair Implicit Entries
   from: '@perlpunk, Spec Example 7.21'
-  tags: flow mapping sequence
+  tags: flow mapping sequence complex-key
   yaml: |
     - [ YAML : separate ]
     - [ "JSON like":adjacent ]
diff --git a/src/C2SP.yaml b/src/C2SP.yaml
index 2ad9de92..c1907cdb 100644
--- a/src/C2SP.yaml
+++ b/src/C2SP.yaml
@@ -1,7 +1,7 @@
 ---
 - name: Flow Mapping Key on two lines
   from: '@perlpunk'
-  tags: error flow mapping
+  tags: error flow mapping complex-key
   fail: true
   yaml: |
     [23
diff --git a/src/KK5P.yaml b/src/KK5P.yaml
index ff564f20..135ea1d7 100644
--- a/src/KK5P.yaml
+++ b/src/KK5P.yaml
@@ -1,7 +1,7 @@
 ---
 - name: Various combinations of explicit block mappings
   from: '@perlpunk'
-  tags: explicit-key mapping sequence
+  tags: explicit-key mapping sequence complex-key
   yaml: |
     complex1:
       ? - a
diff --git a/src/M2N8.yaml b/src/M2N8.yaml
index 3df5481a..025aa802 100644
--- a/src/M2N8.yaml
+++ b/src/M2N8.yaml
@@ -1,7 +1,7 @@
 ---
 - name: Question mark edge cases
   from: '@ingydotnet'
-  tags: edge empty-key
+  tags: edge empty-key complex-key explicit-key
   yaml: |
     - ? : x
   tree: |
diff --git a/src/RZP5.yaml b/src/RZP5.yaml
index e01e7e8c..62f7dfba 100644
--- a/src/RZP5.yaml
+++ b/src/RZP5.yaml
@@ -1,7 +1,7 @@
 ---
 - name: Various Trailing Comments [1.3]
   from: XW4D, modified for YAML 1.3
-  tags: anchor comment folded mapping 1.3-mod
+  tags: anchor comment folded mapping 1.3-mod complex-key explicit-key
   yaml: |
     a: "double
       quotes" # lala
diff --git a/src/XW4D.yaml b/src/XW4D.yaml
index 2acbdb00..a5605e15 100644
--- a/src/XW4D.yaml
+++ b/src/XW4D.yaml
@@ -1,7 +1,7 @@
 ---
 - name: Various Trailing Comments
   from: '@perlpunk'
-  tags: comment explicit-key folded 1.3-err
+  tags: comment explicit-key folded 1.3-err complex-key explicit-key
   yaml: |
     a: "double
       quotes" # lala