diff --git a/cfg/std.cfg b/cfg/std.cfg
index f8ed05866..dee7d8b66 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -705,7 +705,6 @@
     <pure/>
     <leak-ignore/>
     <arg nr="1">
-      <not-null/>
       <not-uninit/>
     </arg>
     <arg nr="2">
diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
index c0bf7bbc8..412a17b77 100644
--- a/test/testnullpointer.cpp
+++ b/test/testnullpointer.cpp
@@ -2572,6 +2572,9 @@ private:
         ASSERT_EQUALS("",errout.str());
         check("size_t get (wchar_t *value) { return wcstombs (NULL, value, 0); }");
         ASSERT_EQUALS("",errout.str());
+
+        check("void f() { strtok(NULL, 'x');}");
+        ASSERT_EQUALS("",errout.str());
     }
 
     void nullpointerFputc() {