diff --git a/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php b/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php
index 9b4821caf7d05a7041f9c1e5046eee6a3bd446d4..4f9082aa4eb2124072b3c9fe39ddd50a901b7bd1 100644
--- a/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php
+++ b/dev/tests/static/framework/Magento/Sniffs/Translation/ConstantUsageSniff.php
@@ -27,7 +27,7 @@ class ConstantUsageSniff implements \PHP_CodeSniffer_Sniff
     }
 
     /**
-     * Copied from \Generic_Sniffs_Files_LineLengthSniff
+     * Copied from \Generic_Sniffs_Files_LineLengthSniff, minor changes made
      *
      * {@inheritDoc}
      */
@@ -35,7 +35,7 @@ class ConstantUsageSniff implements \PHP_CodeSniffer_Sniff
     {
         $tokens = $phpcsFile->getTokens();
 
-        // Make sure this is the first open tag.
+        // Make sure this is the first open tag
         $previousOpenTag = $phpcsFile->findPrevious(T_OPEN_TAG, ($stackPtr - 1));
         if ($previousOpenTag !== false) {
             return;
@@ -45,19 +45,16 @@ class ConstantUsageSniff implements \PHP_CodeSniffer_Sniff
         $currentLineContent = '';
         $currentLine = 1;
 
-        $trim = (strlen($phpcsFile->eolChar) * -1);
         for (; $tokenCount < $phpcsFile->numTokens; $tokenCount++) {
             if ($tokens[$tokenCount]['line'] === $currentLine) {
                 $currentLineContent .= $tokens[$tokenCount]['content'];
             } else {
-                $currentLineContent = substr($currentLineContent, 0, $trim);
                 $this->checkIfFirstArgumentConstant($phpcsFile, ($tokenCount - 1), $currentLineContent);
                 $currentLineContent = $tokens[$tokenCount]['content'];
                 $currentLine++;
             }
         }
 
-        $currentLineContent = substr($currentLineContent, 0, $trim);
         $this->checkIfFirstArgumentConstant($phpcsFile, ($tokenCount - 1), $currentLineContent);
     }
 
diff --git a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php
index addb30067529fcc7f12763f287a616e93de780bc..a64d47054ede9bc1f695514aa8f3ef95fc1e8eeb 100644
--- a/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php
+++ b/dev/tests/static/framework/tests/unit/testsuite/Magento/Sniffs/Translation/ConstantUsageSniffTest.php
@@ -43,7 +43,6 @@ class ConstantUsageSniffTest extends \PHPUnit_Framework_TestCase
         $this->fileMock->expects($this->once())
             ->method('getTokens')
             ->willReturn($tokens);
-        $this->fileMock->eolChar = 2;
         $this->fileMock->numTokens = count($tokens);
         $this->fileMock->expects($this->exactly($numIncorrectUsages))
             ->method('addError')