diff --git a/lib/executionpath.cpp b/lib/executionpath.cpp
index 82168ba66..ac4b177a1 100644
--- a/lib/executionpath.cpp
+++ b/lib/executionpath.cpp
@@ -66,7 +66,7 @@ static const Token *checkExecutionPaths_(const Token *tok, std::list<ExecutionPa
             return 0;
 
         // todo: handle for/while
-        if (Token::Match(tok, "for|while|switch"))
+        if (Token::Match(tok, "for|while|switch|do"))
         {
             ExecutionPath::bailOut(checks);
             return 0;
diff --git a/test/testother.cpp b/test/testother.cpp
index bc1eb8b4f..da4383520 100644
--- a/test/testother.cpp
+++ b/test/testother.cpp
@@ -1267,6 +1267,19 @@ private:
                        "}\n");
         ASSERT_EQUALS("", errout.str());
 
+        checkUninitVar("int f(int a, int b)\n"
+                       "{\n"
+                       "   int x;\n"
+                       "   if (a)\n"
+                       "      x = a;\n"
+                       "   else {\n"
+                       "      do { } while (f2());\n"
+                       "      x = b;\n"
+                       "   }\n"
+                       "   return x;\n"
+                       "}\n");
+        ASSERT_EQUALS("", errout.str());
+
         // switch..
         checkUninitVar("char * f()\n"
                        "{\n"