diff --git a/package.xml b/package.xml
index c408f94353..1c1f7f39e6 100644
--- a/package.xml
+++ b/package.xml
@@ -1299,6 +1299,13 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.9.inc.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.10.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.10.inc.fixed" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.11.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.11.inc.fixed" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.12.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.12.inc.fixed" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.13.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.13.inc.fixed" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.14.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="EndFileNewlineUnitTest.php" role="test" />
        </dir>
        <dir name="Methods">
diff --git a/src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php b/src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php
index 241fa5a8f4..aed461f83f 100644
--- a/src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php
+++ b/src/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php
@@ -23,7 +23,10 @@ class EndFileNewlineSniff implements Sniff
      */
     public function register()
     {
-        return [T_OPEN_TAG];
+        return [
+            T_OPEN_TAG,
+            T_OPEN_TAG_WITH_ECHO,
+        ];
 
     }//end register()
 
diff --git a/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.11.inc b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.11.inc
new file mode 100644
index 0000000000..4f2e47af9c
--- /dev/null
+++ b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.11.inc
@@ -0,0 +1 @@
+<?= 'foo';
\ No newline at end of file
diff --git a/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.11.inc.fixed b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.11.inc.fixed
new file mode 100644
index 0000000000..1f87609292
--- /dev/null
+++ b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.11.inc.fixed
@@ -0,0 +1 @@
+<?= 'foo';
diff --git a/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.12.inc b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.12.inc
new file mode 100644
index 0000000000..db6d1b8931
--- /dev/null
+++ b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.12.inc
@@ -0,0 +1 @@
+<?= 'foo' ?>
\ No newline at end of file
diff --git a/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.12.inc.fixed b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.12.inc.fixed
new file mode 100644
index 0000000000..d3c19feeb2
--- /dev/null
+++ b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.12.inc.fixed
@@ -0,0 +1 @@
+<?= 'foo' ?>
diff --git a/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.13.inc b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.13.inc
new file mode 100644
index 0000000000..fa2f476a92
--- /dev/null
+++ b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.13.inc
@@ -0,0 +1,5 @@
+<?= 'foo'
+
+
+
+
diff --git a/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.13.inc.fixed b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.13.inc.fixed
new file mode 100644
index 0000000000..e4016b081a
--- /dev/null
+++ b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.13.inc.fixed
@@ -0,0 +1 @@
+<?= 'foo'
diff --git a/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.14.inc b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.14.inc
new file mode 100644
index 0000000000..d3c19feeb2
--- /dev/null
+++ b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.14.inc
@@ -0,0 +1 @@
+<?= 'foo' ?>
diff --git a/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php
index a80c16dbed..456106fe5a 100644
--- a/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php
+++ b/src/Standards/PSR2/Tests/Files/EndFileNewlineUnitTest.php
@@ -35,6 +35,10 @@ public function getErrorList($testFile='')
         case 'EndFileNewlineUnitTest.9.inc':
         case 'EndFileNewlineUnitTest.10.inc':
             return [2 => 1];
+        case 'EndFileNewlineUnitTest.11.inc':
+        case 'EndFileNewlineUnitTest.12.inc':
+        case 'EndFileNewlineUnitTest.13.inc':
+            return [1 => 1];
         default:
             return [];
         }//end switch