diff --git a/dev-support/findbugs-exclude.xml b/dev-support/findbugs-exclude.xml
index 67e633ef685..b47ef46b72f 100644
--- a/dev-support/findbugs-exclude.xml
+++ b/dev-support/findbugs-exclude.xml
@@ -37,9 +37,13 @@
   </Match>
 
   <Match>
-    <Package name="org.apache.hadoop.hbase.tmpl"/>
+    <!-- Nested packages are not included by the filter, so we need a regexp... -->
+    <Package name="~org\.apache\.hadoop\.hbase\.tmpl\..*"/>
   </Match>
 
+  <Match>
+    <Package name="~org\.apache\.hadoop\.hbase\.generated\..*"/>
+  </Match>
 
   <Match>
     <Class name="org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost"/>
diff --git a/dev-support/test-patch.properties b/dev-support/test-patch.properties
index 93ab3058ea4..1c1e7c10f61 100644
--- a/dev-support/test-patch.properties
+++ b/dev-support/test-patch.properties
@@ -19,7 +19,7 @@ MAVEN_OPTS="-Xmx3100M"
 # Please update the per-module test-patch.properties if you update this file.
 
 OK_RELEASEAUDIT_WARNINGS=0
-OK_FINDBUGS_WARNINGS=127
+OK_FINDBUGS_WARNINGS=109
 # Allow two warnings.  Javadoc complains about sun.misc.Unsafe use.  See HBASE-7457
 OK_JAVADOC_WARNINGS=2