diff --git a/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.3.inc b/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.3.inc
index 9b7ccd6dcd..6c4f83d562 100644
--- a/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.3.inc
+++ b/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.3.inc
@@ -12,5 +12,9 @@ Some content <?
 echo '<?';
 ?> Some more content
 
+// Test snippet clipping with a line that has more than 40 characters after the PHP open tag.
+Some content <? echo $var; ?> Some longer content to trigger snippet clipping
+
 // Only recognize closing tag after opener.
+// The test below must be the last test in the file because there must be no PHP close tag after it.
 Some?> content <?
diff --git a/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.4.inc b/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.4.inc
new file mode 100644
index 0000000000..83b6ae1f5e
--- /dev/null
+++ b/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.4.inc
@@ -0,0 +1,6 @@
+// Although not the focus of this test, this is an intentional parse error when short_open_tag is on.
+// This should be the only test in this file.
+// Test that the sniff bails when short_open_tag is off and there is a token other than
+// T_INLINE_HTML after the short open tag and before the close tag.
+
+<?<?php
diff --git a/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php b/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php
index a8955d6991..b1fc64d344 100644
--- a/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php
+++ b/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php
@@ -36,6 +36,7 @@ protected function getTestFiles($testFileBase)
             $testFiles[] = $testFileBase.'2.inc';
         } else {
             $testFiles[] = $testFileBase.'3.inc';
+            $testFiles[] = $testFileBase.'4.inc';
         }
 
         return $testFiles;
@@ -97,6 +98,7 @@ public function getWarningList($testFile='')
                 3  => 1,
                 6  => 1,
                 11 => 1,
+                16 => 1,
             ];
         default:
             return [];