diff --git a/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.1.inc b/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.1.inc
index 080dda9382..4bd83f0433 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.1.inc
+++ b/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.1.inc
@@ -19,7 +19,7 @@ function_call();
 
 ?>
 <input name="<?php ; something_else(); ?>" />
-<input name="<?php something_else(); ; ?>" />
+<input name="<?php something_else(); ; ; ?>" />
 
 /*
  * Test empty statement: no code between PHP open and close tag.
@@ -42,7 +42,7 @@ function_call();
 -->
 <?php ; ?>
 
-<input name="<?php ; ?>" /> <!-- Bad. -->
+<input name="<?php ;; ?>" /> <!-- Bad. -->
 
 <!-- Tests with short open echo tag. -->
 <input name="<?= 'some text' ?>" /> <!-- OK. -->
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.php
index 1e59c0a398..77542acbaa 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/EmptyPHPStatementUnitTest.php
@@ -76,11 +76,11 @@ public function getWarningList($testFile='')
                 15 => 1,
                 18 => 1,
                 21 => 1,
-                22 => 1,
+                22 => 2,
                 31 => 1,
                 33 => 1,
                 43 => 1,
-                45 => 1,
+                45 => 2,
                 49 => 1,
                 50 => 1,
                 57 => 1,