diff --git a/package.xml b/package.xml
index 2c593d512a..1e527ca69c 100644
--- a/package.xml
+++ b/package.xml
@@ -785,6 +785,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.1.inc.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.2.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.2.inc.fixed" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.3.inc" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.3.inc.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.js" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.js.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="DisallowTabIndentUnitTest.php" role="test" />
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php
index 3e20cf4964..2140e55ef5 100644
--- a/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php
+++ b/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php
@@ -76,6 +76,8 @@ public function process(File $phpcsFile, $stackPtr)
             T_DOC_COMMENT_WHITESPACE => true,
             T_DOC_COMMENT_STRING     => true,
             T_COMMENT                => true,
+            T_END_HEREDOC            => true,
+            T_END_NOWDOC             => true,
         ];
 
         for ($i = 0; $i < $phpcsFile->numTokens; $i++) {
diff --git a/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.3.inc b/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.3.inc
new file mode 100644
index 0000000000..68b18938d0
--- /dev/null
+++ b/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.3.inc
@@ -0,0 +1,13 @@
+<?php
+
+$heredoc = <<<"END"
+		a
+		b
+		c
+	END;
+
+$nowdoc = <<<'END'
+		a
+		b
+		c
+	END;
diff --git a/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.3.inc.fixed b/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.3.inc.fixed
new file mode 100644
index 0000000000..622088ad29
--- /dev/null
+++ b/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.3.inc.fixed
@@ -0,0 +1,13 @@
+<?php
+
+$heredoc = <<<"END"
+		a
+		b
+		c
+    END;
+
+$nowdoc = <<<'END'
+		a
+		b
+		c
+    END;
diff --git a/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php
index a32856f5c0..816d24c8d1 100644
--- a/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php
+++ b/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php
@@ -83,7 +83,7 @@ public function getErrorList($testFile='')
                 92 => 1,
                 93 => 1,
             ];
-            break;
+
         case 'DisallowTabIndentUnitTest.2.inc':
             return [
                 6  => 1,
@@ -96,23 +96,33 @@ public function getErrorList($testFile='')
                 13 => 1,
                 19 => 1,
             ];
-            break;
+
+        case 'DisallowTabIndentUnitTest.3.inc':
+            if (\PHP_VERSION_ID >= 70300) {
+                return [
+                    7  => 1,
+                    13 => 1,
+                ];
+            }
+
+            // PHP 7.2 or lower: PHP version which doesn't support flexible heredocs/nowdocs yet.
+            return [];
+
         case 'DisallowTabIndentUnitTest.js':
             return [
                 3 => 1,
                 5 => 1,
                 6 => 1,
             ];
-            break;
+
         case 'DisallowTabIndentUnitTest.css':
             return [
                 1 => 1,
                 2 => 1,
             ];
-            break;
+
         default:
             return [];
-            break;
         }//end switch
 
     }//end getErrorList()