diff --git a/tez-ext-service-tests/findbugs-exclude.xml b/tez-ext-service-tests/findbugs-exclude.xml
index 32c73924ab..ff43d1598f 100644
--- a/tez-ext-service-tests/findbugs-exclude.xml
+++ b/tez-ext-service-tests/findbugs-exclude.xml
@@ -14,21 +14,7 @@
 <FindBugsFilter>
 
   <Match>
-    <Class name="~org\.apache\.tez\.test\.service\.rpc\.TezTestServiceProtocolProtos\$.*Proto" />
-    <Field name="unknownFields" />
-    <Bug pattern="SE_BAD_FIELD" />
-  </Match>
-
-  <Match>
-    <Class name="~org\.apache\.tez\.test\.service\.rpc\.TezTestServiceProtocolProtos\$.*Proto" />
-    <Field name="PARSER" />
-    <Bug pattern="MS_SHOULD_BE_FINAL" />
-  </Match>
-
-  <Match>
-    <Class name="~org\.apache\.tez\.test\.service\.rpc\.TezTestServiceProtocolProtos\$.*Proto\$Builder" />
-    <Method name="maybeForceBuilderInitialization" />
-    <Bug pattern="UCF_USELESS_CONTROL_FLOW" />
+    <Class name="~org\.apache\.tez\.test\.service\.rpc\.TezTestServiceProtocolProtos.*" />
   </Match>
 
 </FindBugsFilter>
diff --git a/tez-plugins/tez-protobuf-history-plugin/findbugs-exclude.xml b/tez-plugins/tez-protobuf-history-plugin/findbugs-exclude.xml
index c91265d650..4a302284c2 100644
--- a/tez-plugins/tez-protobuf-history-plugin/findbugs-exclude.xml
+++ b/tez-plugins/tez-protobuf-history-plugin/findbugs-exclude.xml
@@ -13,38 +13,6 @@
 -->
 <FindBugsFilter>
   <Match>
-    <Class name="~org\.apache\.tez\.dag\.history\.logging\.proto\.HistoryLoggerProtos\$KVPair"/>
-    <Field name="unknownFields"/>
-    <Bug pattern="SE_BAD_FIELD"/>
-  </Match>
-
-  <Match>
-    <Class name="~org\.apache\.tez\.dag\.history\.logging\.proto\.HistoryLoggerProtos\$.*Proto"/>
-    <Field name="unknownFields"/>
-    <Bug pattern="SE_BAD_FIELD"/>
-  </Match>
-
-  <Match>
-    <Class name="~org\.apache\.tez\.dag\.history\.logging\.proto\.HistoryLoggerProtos\$KVPair"/>
-    <Field name="PARSER"/>
-    <Bug pattern="MS_SHOULD_BE_FINAL"/>
-  </Match>
-
-  <Match>
-    <Class name="~org\.apache\.tez\.dag\.history\.logging\.proto\.HistoryLoggerProtos\$.*Proto"/>
-    <Field name="PARSER"/>
-    <Bug pattern="MS_SHOULD_BE_FINAL"/>
-  </Match>
-
-  <Match>
-    <Class name="~org\.apache\.tez\.dag\.history\.logging\.proto\.HistoryLoggerProtos\$KVPair\$Builder"/>
-    <Method name="maybeForceBuilderInitialization"/>
-    <Bug pattern="UCF_USELESS_CONTROL_FLOW"/>
-  </Match>
-
-  <Match>
-    <Class name="~org\.apache\.tez\.dag\.history\.logging\.proto\.HistoryLoggerProtos\$.*Proto\$Builder"/>
-    <Method name="maybeForceBuilderInitialization"/>
-    <Bug pattern="UCF_USELESS_CONTROL_FLOW"/>
+    <Class name="~org\.apache\.tez\.dag\.history\.logging\.proto\.HistoryLoggerProtos.*"/>
   </Match>
 </FindBugsFilter>