diff --git a/lib/checkinternal.cpp b/lib/checkinternal.cpp
index 5a072819b..e7848c351 100644
--- a/lib/checkinternal.cpp
+++ b/lib/checkinternal.cpp
@@ -94,13 +94,18 @@ void CheckInternal::checkRedundantTokCheck()
             // the first tok->previous() check is redundant
             const Token *astOp1 = tok->astOperand1();
             const Token *astOp2 = getArguments(tok->tokAt(3))[0];
-
+            if (Token::simpleMatch(astOp1, "&&")) {
+                astOp1 = astOp1->astOperand2();
+            }
             if (astOp1->expressionString() == astOp2->expressionString()) {
                 checkRedundantTokCheckError(astOp2);
             }
             // if (!tok || !Token::match(tok, "foo"))
         } else if (Token::Match(tok, "%oror% ! Token :: simpleMatch|Match|findsimplematch|findmatch (")) {
             const Token *negTok = tok->next()->astParent()->astOperand1();
+            if (Token::simpleMatch(negTok, "||")) {
+                negTok = negTok->astOperand2();
+            }
             // the first tok condition is negated
             if (Token::simpleMatch(negTok, "!")) {
                 const Token *astOp1 = negTok->astOperand1();
diff --git a/test/testinternal.cpp b/test/testinternal.cpp
index 9a3f37ff7..a46516cef 100644
--- a/test/testinternal.cpp
+++ b/test/testinternal.cpp
@@ -431,6 +431,30 @@ private:
               "}");
         ASSERT_EQUALS("[test.cpp:3]: (style) Unnecessary check of \"tok\", match-function already checks if it is null.\n", errout.str());
 
+        check("void f() {\n"
+              "    const Token *tok;\n"
+              "    if(a && tok && Token::Match(tok, \"5str% foobar\")) {};\n"
+              "}");
+        ASSERT_EQUALS("[test.cpp:3]: (style) Unnecessary check of \"tok\", match-function already checks if it is null.\n", errout.str());
+
+        check("void f() {\n"
+              "    const Token *tok;\n"
+              "    if(a && b && tok && Token::Match(tok, \"5str% foobar\")) {};\n"
+              "}");
+        ASSERT_EQUALS("[test.cpp:3]: (style) Unnecessary check of \"tok\", match-function already checks if it is null.\n", errout.str());
+
+        check("void f() {\n"
+              "    const Token *tok;\n"
+              "    if(a && b && && c && tok && Token::Match(tok, \"5str% foobar\")) {};\n"
+              "}");
+        ASSERT_EQUALS("[test.cpp:3]: (style) Unnecessary check of \"tok\", match-function already checks if it is null.\n", errout.str());
+
+        check("void f() {\n"
+              "    const Token *tok;\n"
+              "    if(a && b && && c && tok && d && Token::Match(tok, \"5str% foobar\")) {};\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
+
         // simpleMatch
         check("void f() {\n"
               "    const Token *tok;\n"
@@ -474,6 +498,12 @@ private:
               "}");
         ASSERT_EQUALS("[test.cpp:3]: (style) Unnecessary check of \"tok\", match-function already checks if it is null.\n", errout.str());
 
+        check("void f() {\n"
+              "    const Token *tok;\n"
+              "    if(a || !tok || !Token::simpleMatch(tok, \"foobar\")) {};\n"
+              "}");
+        ASSERT_EQUALS("[test.cpp:3]: (style) Unnecessary check of \"tok\", match-function already checks if it is null.\n", errout.str());
+
         // if tok || !Token::simpleMatch...
         check("void f() {\n"
               "    const Token *tok;\n"