diff --git a/src/Standards/Squiz/Sniffs/PHP/HeredocSniff.php b/src/Standards/Squiz/Sniffs/PHP/HeredocSniff.php
index a3ab8e5a69..b3ab816d0c 100644
--- a/src/Standards/Squiz/Sniffs/PHP/HeredocSniff.php
+++ b/src/Standards/Squiz/Sniffs/PHP/HeredocSniff.php
@@ -42,8 +42,19 @@ public function register()
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        $error = 'Use of heredoc and nowdoc syntax ("<<<") is not allowed; use standard strings or inline HTML instead';
-        $phpcsFile->addError($error, $stackPtr, 'NotAllowed');
+        $tokens = $phpcsFile->getTokens();
+
+        $codePrefix = 'Heredoc';
+        $data       = ['heredoc'];
+        if ($tokens[$stackPtr]['code'] === T_START_NOWDOC) {
+            $codePrefix = 'Nowdoc';
+            $data       = ['nowdoc'];
+        }
+
+        $data[] = trim($tokens[$stackPtr]['content']);
+
+        $error = 'Use of %s syntax (%s) is not allowed; use standard strings or inline HTML instead';
+        $phpcsFile->addError($error, $stackPtr, $codePrefix.'NotAllowed', $data);
 
     }//end process()