diff --git a/lib/checknullpointer.cpp b/lib/checknullpointer.cpp
index 21e6da6b3..fa3285269 100644
--- a/lib/checknullpointer.cpp
+++ b/lib/checknullpointer.cpp
@@ -110,7 +110,6 @@ void CheckNullPointer::parseFunctionCall(const Token &tok, std::list<const Token
         functionNames1_all.insert("fgetwc");
         functionNames1_all.insert("fgetpos");
         functionNames1_all.insert("fsetpos");
-        functionNames1_all.insert("freopen");
         functionNames1_all.insert("fscanf");
         functionNames1_all.insert("fprintf");
         functionNames1_all.insert("fwscanf");
@@ -161,6 +160,7 @@ void CheckNullPointer::parseFunctionCall(const Token &tok, std::list<const Token
 
         functionNames1_uninit.insert("perror");
         functionNames1_uninit.insert("fflush");
+        functionNames1_uninit.insert("freopen");
     }
 
     // standard functions that dereference second parameter..
diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
index 2d79491cf..70eafea94 100644
--- a/test/testnullpointer.cpp
+++ b/test/testnullpointer.cpp
@@ -1719,6 +1719,9 @@ private:
               "    typeof(*NULL) y;\n"
               "}", true);
         ASSERT_EQUALS("", errout.str());
+
+        check("void f() { freopen(NULL, m, stdin); }");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void gcc_statement_expression() {