diff --git a/cfg/std.cfg b/cfg/std.cfg
index c3d13b9a0..0c9500257 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -7747,7 +7747,10 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
   <function name="std::next">
     <noreturn>false</noreturn>
     <use-retval/>
-    <arg nr="1"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
     <arg nr="2" direction="in" default="1">
       <not-uninit/>
     </arg>
@@ -7758,7 +7761,10 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
   <function name="std::prev">
     <noreturn>false</noreturn>
     <use-retval/>
-    <arg nr="1"/>
+    <leak-ignore/>
+    <arg nr="1" direction="in">
+      <not-uninit/>
+    </arg>
     <arg nr="2" direction="in" default="1">
       <not-uninit/>
     </arg>
diff --git a/test/cfg/std.cpp b/test/cfg/std.cpp
index d45c8a695..1d10031a7 100644
--- a/test/cfg/std.cpp
+++ b/test/cfg/std.cpp
@@ -7,28 +7,75 @@
 // No warnings about bad library configuration, unmatched suppressions, etc. exitcode=0
 //
 
-#include <cstring>
+#include <bitset>
+#include <cassert>
+#include <cctype>
+#include <cfenv>
+#include <cinttypes>
+#include <clocale>
+#include <cmath>
+#include <complex>
+#include <csetjmp>
+#include <csignal>
+#include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
+#include <cstring>
 #include <ctime>
-#include <cctype>
-#include <clocale>
-#include <complex>
-#include <cassert>
 #include <cwchar>
-#include <cfenv>
-#include <csetjmp>
-#include <cmath>
-#include <csignal>
-#include <iostream>
-#include <iomanip>
-#include <cinttypes>
-#include <istream>
 #include <fstream>
-#include <vector>
-#include <cstdarg>
 #include <functional>
-#include <bitset>
+#include <iomanip>
+#include <iostream>
+#include <istream>
+#include <iterator>
+#include <vector>
+
+void uninitvar_std_next(const std::vector<int> &v, int count)
+{
+    // No warning shall be shown:
+    if (std::next(v.begin()) != v.end()) {}
+    if (std::next(v.begin(), count) != v.end()) {}
+
+    std::vector<int>::iterator it;
+    // TODO-cppcheck-suppress uninitvar
+    if (std::next(it) != v.end()) {}
+
+    std::vector<int>::const_iterator const_it;
+    // TODO-cppcheck-suppress uninitvar
+    if (std::next(const_it) != v.end()) {}
+
+    std::vector<int>::reverse_iterator rit;
+    // TODO-cppcheck-suppress uninitvar
+    if (std::next(rit) != v.rend()) {}
+
+    std::vector<int>::const_reverse_iterator const_rit;
+    // TODO-cppcheck-suppress uninitvar
+    if (std::next(const_rit) != v.rend()) {}
+}
+
+void uninitvar_std_prev(const std::vector<int> &v, int count)
+{
+    // No warning shall be shown:
+    if (std::prev(v.begin()) != v.end()) {}
+    if (std::prev(v.begin(), count) != v.end()) {}
+
+    std::vector<int>::iterator it;
+    // TODO-cppcheck-suppress uninitvar
+    if (std::prev(it) != v.end()) {}
+
+    std::vector<int>::const_iterator const_it;
+    // TODO-cppcheck-suppress uninitvar
+    if (std::prev(const_it) != v.end()) {}
+
+    std::vector<int>::reverse_iterator rit;
+    // TODO-cppcheck-suppress uninitvar
+    if (std::prev(rit) != v.rend()) {}
+
+    std::vector<int>::const_reverse_iterator const_rit;
+    // TODO-cppcheck-suppress uninitvar
+    if (std::prev(const_rit) != v.rend()) {}
+}
 
 void overlappingWriteFunction_wcscat(wchar_t *src, wchar_t *dest)
 {