diff --git a/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php b/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php
index ff1cd830ea..4c54aa4618 100644
--- a/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php
+++ b/src/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php
@@ -225,7 +225,7 @@ protected function getNamespaceOfScope(File $phpcsFile, $stackPtr)
         $namespaceDeclaration = $phpcsFile->findPrevious(T_NAMESPACE, $stackPtr);
 
         if ($namespaceDeclaration !== false) {
-            $endOfNamespaceDeclaration = $phpcsFile->findNext([T_SEMICOLON, T_OPEN_CURLY_BRACKET], $namespaceDeclaration);
+            $endOfNamespaceDeclaration = $phpcsFile->findNext([T_SEMICOLON, T_OPEN_CURLY_BRACKET, T_CLOSE_TAG], $namespaceDeclaration);
             $namespace = $this->getDeclarationNameWithNamespace(
                 $phpcsFile->getTokens(),
                 ($endOfNamespaceDeclaration - 1)
diff --git a/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.inc b/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.inc
index 0a0729a0a9..f2c4713a66 100644
--- a/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.inc
+++ b/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.inc
@@ -172,3 +172,14 @@ namespace Foo /*comment*/ \ Bah {
         }
     }
 }
+
+namespace EndsIn\CloseTag ?>
+<?php
+
+class Baz {
+    function myFunction()
+    {
+        \EndsIn\CloseTag\Whatever::something();
+        \EndsIn\CloseTag\Baz::something();
+    }
+}
diff --git a/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.inc.fixed b/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.inc.fixed
index f2c1731dc7..95689d4a9f 100644
--- a/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.inc.fixed
+++ b/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.inc.fixed
@@ -160,3 +160,14 @@ namespace Foo /*comment*/ \ Bah {
         }
     }
 }
+
+namespace EndsIn\CloseTag ?>
+<?php
+
+class Baz {
+    function myFunction()
+    {
+        \EndsIn\CloseTag\Whatever::something();
+        self::something();
+    }
+}
diff --git a/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php b/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php
index 72760a5e96..180a010631 100644
--- a/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php
+++ b/src/Standards/Squiz/Tests/Classes/SelfMemberReferenceUnitTest.php
@@ -46,6 +46,7 @@ public function getErrorList()
             143 => 2,
             162 => 1,
             171 => 1,
+            183 => 1,
         ];
 
     }//end getErrorList()