diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
index 503e821d4..8884db7ae 100644
--- a/lib/valueflow.cpp
+++ b/lib/valueflow.cpp
@@ -920,7 +920,8 @@ static void valueFlowAST(Token *tok, unsigned int varid, const ValueFlow::Value
 }
 
 /** if known variable is changed in loop body, change it to a possible value */
-static void handleKnownValuesInLoop(const Token                 *loopBodyStart,
+static void handleKnownValuesInLoop(const Token                 *startToken,
+                                    const Token                 *endToken,
                                     std::list<ValueFlow::Value> *values,
                                     unsigned int                varid)
 {
@@ -928,7 +929,7 @@ static void handleKnownValuesInLoop(const Token                 *loopBodyStart,
     for (std::list<ValueFlow::Value>::iterator it = values->begin(); it != values->end(); ++it) {
         if (it->isKnown()) {
             if (!isChanged) {
-                if (!isVariableChanged(loopBodyStart, loopBodyStart->link(), varid))
+                if (!isVariableChanged(startToken, endToken, varid))
                     break;
                 isChanged = true;
             }
@@ -1022,7 +1023,11 @@ static bool valueFlowForward(Token * const               startToken,
         }
 
         else if (Token::simpleMatch(tok2, "do {")) {
-            handleKnownValuesInLoop(tok2->next(), &values, varid);
+            const Token *start = tok2->next();
+            const Token *end   = start->link();
+            if (Token::simpleMatch(end, "} while ("))
+                end = end->linkAt(2);
+            handleKnownValuesInLoop(start, end, &values, varid);
         }
 
         // conditional block of code that assigns variable..
@@ -1035,7 +1040,7 @@ static bool valueFlowForward(Token * const               startToken,
             }
 
             // if known variable is changed in loop body, change it to a possible value..
-            handleKnownValuesInLoop(tok2->linkAt(1)->next(), &values, varid);
+            handleKnownValuesInLoop(tok2, tok2->linkAt(1)->linkAt(1), &values, varid);
 
             // Set values in condition
             for (Token* tok3 = tok2->tokAt(2); tok3 != tok2->next()->link(); tok3 = tok3->next()) {
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
index 887d7148f..496e8c05a 100644
--- a/test/testvalueflow.cpp
+++ b/test/testvalueflow.cpp
@@ -1665,6 +1665,12 @@ private:
         ASSERT_EQUALS(1, value.intvalue);
         ASSERT(value.isPossible());
 
+        code = "void f() {\n"
+               "  int x = 0;\n"
+               "  do { } while (++x < 12);\n" // <- possible value
+               "}";
+        ASSERT(isNotKnownValues(code, "<"));
+
         code = "void f() {\n"
                "  static int x = 0;\n"
                "  return x + 1;\n" // <- possible value