diff --git a/cfg/std.cfg b/cfg/std.cfg
index dee7d8b66..99196138f 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -752,7 +752,7 @@
 	  </arg> <arg nr="3"><valid>0,2:36</valid></arg>
   </function>
   <function name="time"> <noreturn>false</noreturn> <leak-ignore/> </function>
-  <function name="tmpnam"> <noreturn>false</noreturn> <leak-ignore/> <arg nr="1"><not-uninit/></arg></function>
+  <function name="tmpnam"> <noreturn>false</noreturn> <leak-ignore/> <arg nr="1"></arg></function>
   <function name="tmpfile"> <noreturn>false</noreturn> </function>
   <function name="tolower"> <noreturn>false</noreturn> <leak-ignore/> <arg nr="1"><valid>0:255</valid></arg> </function>
   <function name="toupper"> <noreturn>false</noreturn> <leak-ignore/> <arg nr="1"><valid>0:255</valid></arg> </function>
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
index 666a3a4a5..6e77f7df6 100644
--- a/test/testuninitvar.cpp
+++ b/test/testuninitvar.cpp
@@ -3800,6 +3800,17 @@ private:
                        "  mbstowcs (wbuf, str, 3);\n"
                        "}");
         ASSERT_EQUALS("", errout.str());
+
+        checkUninitVar("void foo() {\n"
+                       "  char buf[10];\n"
+                       "  tmpnam(buf);\n"
+                       "}");
+        ASSERT_EQUALS("", errout.str());
+        checkUninitVar("void foo() {\n"
+                       "  char *ptr;\n"
+                       "  tmpnam(ptr);\n"
+                       "}");
+        TODO_ASSERT_EQUALS("[test.cpp:3]: (error) Uninitialized variable: ptr\n", "", errout.str());
     }
 
     void checkDeadPointer(const char code[]) {