diff --git a/checkstyle.xml b/checkstyle.xml
index 6e2b56d55..73989f4f0 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -188,6 +188,9 @@
     <property name="onCommentFormat"  value="CHECKSTYLE\: resume DeclarationOrder"/>
     <property name="checkFormat"      value="DeclarationOrder"/>
   </module>
-
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="CHECKSTYLE\: stop all"/>
+    <property name="onCommentFormat" value="CHECKSTYLE\: resume all"/>
+  </module>
 </module>
 
diff --git a/src/main/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizer.java b/src/main/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizer.java
index 5197d2088..ba9048fa0 100644
--- a/src/main/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizer.java
+++ b/src/main/java/org/apache/commons/math3/optimization/direct/BOBYQAOptimizer.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE: stop all
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -160,7 +161,7 @@ public class BOBYQAOptimizer
      * XXX "su" in the original code.
      */
     private ArrayRealVector upperDifference;
-    /** 
+    /**
      * Parameters of the implicit second derivatives of the quadratic model.
      * XXX "pq" in the original code.
      */