diff --git a/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php b/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php
index cbd9651ddf..79a77557d1 100644
--- a/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php
+++ b/src/Standards/Generic/Sniffs/NamingConventions/TraitNameSuffixSniff.php
@@ -40,6 +40,7 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $traitName = $phpcsFile->getDeclarationName($stackPtr);
         if ($traitName === null) {
+            // Live coding or parse error. Bow out.
             return;
         }
 
diff --git a/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.1.inc b/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.1.inc
new file mode 100644
index 0000000000..e1d4908251
--- /dev/null
+++ b/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.1.inc
@@ -0,0 +1,11 @@
+<?php
+
+trait MissingTraitSuffix {} // Error.
+
+trait GoodTrait {}
+
+trait SuffixCaseIsNotEnforced_tRaIt {}
+
+trait
+    /*comment*/
+    AnotherInvalidTraitName {} // Error.
diff --git a/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.2.inc b/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.2.inc
new file mode 100644
index 0000000000..396a3c7bbd
--- /dev/null
+++ b/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.2.inc
@@ -0,0 +1,7 @@
+<?php
+
+// Intentional parse error (no trait name).
+// This should be the only test in this file.
+// Testing that the sniff is *not* triggered.
+
+trait
diff --git a/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.inc b/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.inc
deleted file mode 100644
index e807697185..0000000000
--- a/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-trait BadName {} // error
-
-trait GoodTrait {}
-
-trait GoodTraitTrait {}
-
-trait BadTraitName {} // error
-
-trait BadTraitNametrait {}
-
-trait NormalTraitNameTrait {}
\ No newline at end of file
diff --git a/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php b/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php
index efef8df6e6..391cbfc773 100644
--- a/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php
+++ b/src/Standards/Generic/Tests/NamingConventions/TraitNameSuffixUnitTest.php
@@ -25,14 +25,22 @@ final class TraitNameSuffixUnitTest extends AbstractSniffUnitTest
      * The key of the array should represent the line number and the value
      * should represent the number of errors that should occur on that line.
      *
+     * @param string $testFile The name of the test file to process.
+     *
      * @return array<int, int>
      */
-    public function getErrorList()
+    public function getErrorList($testFile='')
     {
-        return [
-            3 => 1,
-            9 => 1,
-        ];
+        switch ($testFile) {
+        case 'TraitNameSuffixUnitTest.1.inc':
+            return [
+                3 => 1,
+                9 => 1,
+            ];
+
+        default:
+            return [];
+        }
 
     }//end getErrorList()