diff --git a/src/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php
index 45bcdbdef6..afc7ac071a 100644
--- a/src/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php
+++ b/src/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php
@@ -110,7 +110,7 @@ public function process(File $phpcsFile, $stackPtr)
             } else {
                 $fix = $phpcsFile->addFixableError('Expected %s', $closingBracket, 'Missing', $data);
                 if ($fix === true) {
-                    $phpcsFile->fixer->replaceToken($closingBracket, '}'.$comment.$phpcsFile->eolChar);
+                    $phpcsFile->fixer->replaceToken($closingBracket, '}'.$comment);
                 }
             }
 
diff --git a/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.inc.fixed b/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.inc.fixed
new file mode 100644
index 0000000000..4515c41a4b
--- /dev/null
+++ b/src/Standards/Squiz/Tests/Commenting/ClosingDeclarationCommentUnitTest.inc.fixed
@@ -0,0 +1,85 @@
+<?php
+
+function __construct()
+{
+}//end __construct()
+
+function myFunction()
+{
+}//end myFunction()
+
+function ourFunction()
+{
+}//end ourFunction()
+
+function yourFunction()
+{
+}//end yourFunction()
+
+class TestClass
+{
+    function __construct()
+    {
+    }//end __construct()
+
+    function myFunction()
+    {
+    }//end myFunction()
+
+    function yourFunction()
+    {
+    }//end yourFunction()
+
+}//end class
+
+abstract class TestClass
+{
+    abstract function myFunction();
+
+    function ourFunction()
+    {
+    }//end ourFunction()
+
+    function yourFunction()
+    {
+    }//end yourFunction()
+
+}//end class
+
+interface TestClass
+{
+    function myFunction();
+    function ourFunction();
+    function yourFunction();
+
+}//end interface
+
+class TestClass
+{
+}//end class
+
+abstract class TestClass
+{
+}//end class
+
+interface TestClass
+{
+}//end interface
+
+class MyClass
+{
+    public function myFunction();
+}//end class
+
+// Closures don't need end comments.
+echo preg_replace_callback('~-([a-z])~', function ($match) { return strtoupper($match[1]); }, 'hello-world');
+
+class TestClass
+{
+}//end class
+
+enum MissingClosingComment {
+}//end enum
+
+enum HasClosingComment {
+}//end enum