diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
index 1f8ffb945..72bb93912 100644
--- a/lib/checkbufferoverrun.cpp
+++ b/lib/checkbufferoverrun.cpp
@@ -470,7 +470,19 @@ void CheckBufferOverrun::checkScope(const Token *tok, const std::vector<std::str
                 if (max <= size)
                     condition_out_of_bounds = false;
             }
-            else if (! Token::Match(tok3, "++|--| %varid% ++|--| )", counter_varid))
+            else if (Token::Match(tok3, "--| %varid% --| )", counter_varid))
+            {
+                if (MathLib::toLongNumber(min_counter_value) < MathLib::toLongNumber(max_counter_value))
+                {
+                    // Code relies on the fact that integer will overflow:
+                    // for (unsigned int i = 3; i < 5; --i)
+
+                    // Set min value in this case to zero.
+                    max_counter_value = min_counter_value;
+                    min_counter_value = "0";
+                }
+            }
+            else if (! Token::Match(tok3, "++| %varid% ++| )", counter_varid))
             {
                 continue;
             }
diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
index ab5e69246..82786c488 100644
--- a/test/testbufferoverrun.cpp
+++ b/test/testbufferoverrun.cpp
@@ -990,6 +990,24 @@ private:
               "    }\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:5]: (error) Buffer access out-of-bounds\n", errout.str());
+
+        check("void f()\n"
+              "{\n"
+              "    char val[5];\n"
+              "    for (unsigned int i = 3; i < 5; --i) {\n"
+              "        val[i+1] = val[i];\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
+
+        check("void f()\n"
+              "{\n"
+              "    char val[5];\n"
+              "    for (int i = 3; i < 5; --i) {\n"
+              "        val[i+1] = val[i];\n"
+              "    }\n"
+              "}\n");
+        TODO_ASSERT_EQUALS("[test.cpp:5]: (error) Array 'val[5]' index -1 out of bounds\n", errout.str());
     }
 
     void buffer_overrun_1()