diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
index 4966231ba36..0d6c68f153e 100644
--- a/test/testbufferoverrun.cpp
+++ b/test/testbufferoverrun.cpp
@@ -116,6 +116,7 @@ class TestBufferOverrun : public TestFixture
         TEST_CASE(array_index_for_break);  // FP: for,break
         TEST_CASE(array_index_for);        // FN: for,if
         TEST_CASE(array_index_for_neq);    // #2211: Using != in condition
+        TEST_CASE(array_index_for_printf);
 
         TEST_CASE(buffer_overrun_1);
         TEST_CASE(buffer_overrun_2);
@@ -1366,6 +1367,15 @@ class TestBufferOverrun : public TestFixture
               "    }\n"
               "}\n");
         ASSERT_EQUALS("", errout.str());
+
+        // check for conditional operator
+        check("void f() {\n"
+              "    int a[10];\n"
+              "    for (int i = 0; i < 10; i++) {\n"
+              "        i == 0 ? 0 : a[i-1];\n"
+              "    }\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void array_index_for_neq()
@@ -1380,6 +1390,16 @@ class TestBufferOverrun : public TestFixture
         ASSERT_EQUALS("[test.cpp:4]: (error) Buffer access out-of-bounds: a\n", errout.str());
     }
 
+    void array_index_for_printf()
+    {
+        check("typedef char Str[10];\n"
+              "void f() {\n"
+              "    Str s;\n"
+              "    printf(\"%.*s %.*s\\n\", sizeof(Str), s, sizeof(Str), s);\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
+    }
+
     void buffer_overrun_1()
     {
         check("void f()\n"