diff --git a/comphelper/qa/unit/syntaxhighlighttest.cxx b/comphelper/qa/unit/syntaxhighlighttest.cxx
index d26b8556681d..8fab0677d4eb 100644
--- a/comphelper/qa/unit/syntaxhighlighttest.cxx
+++ b/comphelper/qa/unit/syntaxhighlighttest.cxx
@@ -41,11 +41,10 @@ void SyntaxHighlightTest::testBasicString()
             aPortions.begin(), itrEnd = aPortions.end(); itr != itrEnd; ++itr)
     {
         CPPUNIT_ASSERT_EQUAL(prevEnd, itr->nBegin);
-        //The comment is empty, so empty zone
-        CPPUNIT_ASSERT(itr->nBegin <= itr->nEnd);
+        CPPUNIT_ASSERT(itr->nBegin < itr->nEnd);
         prevEnd = itr->nEnd;
     }
-    CPPUNIT_ASSERT_EQUAL(aBasicString.getLength() - 1, prevEnd);
+    CPPUNIT_ASSERT_EQUAL(aBasicString.getLength(), prevEnd);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SyntaxHighlightTest);
diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx
index c6340ef68f54..83bcb59becc3 100644
--- a/comphelper/source/misc/syntaxhighlight.cxx
+++ b/comphelper/source/misc/syntaxhighlight.cxx
@@ -399,14 +399,16 @@ sal_Bool SimpleTokenizer_Impl::getNextToken( /*out*/TokenTypes& reType,
             // Comment?
             if ( c == '\'' )
             {
-                c = peekChar();
+                c = getChar();
 
                 // Remove all characters until end of line or EOF
                 sal_Unicode cPeek = c;
                 while( cPeek != 0 && testCharFlags( cPeek, CHAR_EOL ) == sal_False )
                 {
-                    cPeek = getChar();
+                    getChar();
+                    cPeek = peekChar();
                 }
+
                 reType = TT_COMMENT;
             }
 
@@ -672,7 +674,7 @@ void SimpleTokenizer_Impl::getHighlightPortions( sal_uInt32 nParseLine, const OU
     const sal_Unicode* pEndPos;
 
     // Loop over all the tokens
-    while( getNextToken( eType, pStartPos, pEndPos )  )
+    while( getNextToken( eType, pStartPos, pEndPos ) )
     {
         portions.push_back(
             HighlightPortion(