diff --git a/src/checkother.h b/src/checkother.h
index 47015ec0e..a2ddbc90f 100644
--- a/src/checkother.h
+++ b/src/checkother.h
@@ -44,8 +44,12 @@ public:
     void runChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
     {
         CheckOther checkOther(tokenizer, settings, errorLogger);
-        checkOther.CheckUnsignedDivision();
-        checkOther.CheckCharVariable();
+
+        if (settings->_checkCodingStyle)
+        {
+            checkOther.CheckUnsignedDivision();
+            checkOther.CheckCharVariable();
+        }
     }
 
     void runSimplifiedChecks(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)