diff --git a/dev-support/rat/rat-exclusions.txt b/dev-support/rat/rat-exclusions.txt
index 4531b1b601c..ab06a6f3c75 100644
--- a/dev-support/rat/rat-exclusions.txt
+++ b/dev-support/rat/rat-exclusions.txt
@@ -47,6 +47,7 @@ src/test/resources/additionalfields.container
 src/test/resources/incorrect.checksum.container
 src/test/resources/incorrect.container
 src/test/resources/test.db.ini
+src/test/resources/metadata/**
 
 # hadoop-hdds/docs
 **/themes/ozonedoc/**
diff --git a/hadoop-hdds/container-service/dev-support/findbugsExcludeFile.xml b/hadoop-hdds/container-service/dev-support/findbugsExcludeFile.xml
index f68fa91db86..ccc786c1fe1 100644
--- a/hadoop-hdds/container-service/dev-support/findbugsExcludeFile.xml
+++ b/hadoop-hdds/container-service/dev-support/findbugsExcludeFile.xml
@@ -81,4 +81,16 @@
     <Class name="org.apache.hadoop.ozone.container.ozoneimpl.TestBackgroundContainerMetadataScanner"/>
     <Bug pattern="RU_INVOKE_RUN, RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT" />
   </Match>
+  <Match>
+    <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE">
+      <Class name="org.apache.hadoop.ozone.container.ozoneimpl.TestOzoneContainer"/>
+      <Method name="testCleanUpMetadataDirInCaseOfDeadNodeState"/>
+    </Bug>
+  </Match>
+  <Match>
+    <Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT">
+      <Class name="org.apache.hadoop.ozone.container.ozoneimpl.TestOzoneContainer"/>
+      <Method name="testCleanUpMetadataDirInCaseOfDeadNodeState"/>
+    </Bug>
+  </Match>
 </FindBugsFilter>