diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/token/TestOzoneBlockTokenIdentifier.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/token/TestOzoneBlockTokenIdentifier.java
similarity index 90%
rename from hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/token/TestOzoneBlockTokenIdentifier.java
rename to hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/token/TestOzoneBlockTokenIdentifier.java
index dd8c2778587f..c834e8c89c59 100644
--- a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/token/TestOzoneBlockTokenIdentifier.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/security/token/TestOzoneBlockTokenIdentifier.java
@@ -52,6 +52,7 @@
 import org.apache.hadoop.util.Time;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
@@ -60,7 +61,7 @@
 /**
  * Test class for {@link OzoneBlockTokenIdentifier}.
  */
-public class TestOzoneBlockTokenIdentifier {
+class TestOzoneBlockTokenIdentifier {
 
   private static final Logger LOG = LoggerFactory
       .getLogger(TestOzoneBlockTokenIdentifier.class);
@@ -73,10 +74,10 @@ public class TestOzoneBlockTokenIdentifier {
   private static X509Certificate cert;
 
   @BeforeAll
-  public static void setUp() throws Exception {
+  static void setUp() throws Exception {
     File base = new File(BASEDIR);
     FileUtil.fullyDelete(base);
-    base.mkdirs();
+    Assumptions.assumeTrue(base.mkdirs());
     expiryTime = Time.monotonicNow() + 60 * 60 * 24;
 
     // Create Ozone Master key pair.
@@ -87,12 +88,12 @@ public static void setUp() throws Exception {
   }
 
   @AfterEach
-  public void cleanUp() throws Exception {
+  void cleanUp() {
     // KeyStoreTestUtil.cleanupSSLConfig(KEYSTORES_DIR, sslConfsDir);
   }
 
   @Test
-  public void testSignToken() throws GeneralSecurityException, IOException {
+  void testSignToken() throws GeneralSecurityException, IOException {
     String keystore = new File(KEYSTORES_DIR, "keystore.jks")
         .getAbsolutePath();
     String truststore = new File(KEYSTORES_DIR, "truststore.jks")
@@ -134,7 +135,7 @@ public void testSignToken() throws GeneralSecurityException, IOException {
   }
 
   @Test
-  public void testTokenSerialization() throws GeneralSecurityException,
+  void testTokenSerialization() throws GeneralSecurityException,
       IOException {
     String keystore = new File(KEYSTORES_DIR, "keystore.jks")
         .getAbsolutePath();
@@ -162,12 +163,12 @@ public void testTokenSerialization() throws GeneralSecurityException,
     byte[] signedToken = signTokenAsymmetric(tokenId, privateKey);
 
 
-    Token<OzoneBlockTokenIdentifier> token = new Token(tokenId.getBytes(),
+    Token<OzoneBlockTokenIdentifier> token = new Token<>(tokenId.getBytes(),
         signedToken, tokenId.getKind(), new Text("host:port"));
 
     String encodeToUrlString = token.encodeToUrlString();
 
-    Token<OzoneBlockTokenIdentifier>decodedToken = new Token();
+    Token<OzoneBlockTokenIdentifier>decodedToken = new Token<>();
     decodedToken.decodeFromUrlString(encodeToUrlString);
 
     OzoneBlockTokenIdentifier decodedTokenId = new OzoneBlockTokenIdentifier();
@@ -184,24 +185,22 @@ public void testTokenSerialization() throws GeneralSecurityException,
   }
 
 
-  public byte[] signTokenAsymmetric(OzoneBlockTokenIdentifier tokenId,
+  private byte[] signTokenAsymmetric(OzoneBlockTokenIdentifier tokenId,
       PrivateKey privateKey) throws NoSuchAlgorithmException,
       InvalidKeyException, SignatureException {
     Signature rsaSignature = Signature.getInstance("SHA256withRSA");
     rsaSignature.initSign(privateKey);
     rsaSignature.update(tokenId.getBytes());
-    byte[] signature = rsaSignature.sign();
-    return signature;
+    return rsaSignature.sign();
   }
 
-  public boolean verifyTokenAsymmetric(OzoneBlockTokenIdentifier tokenId,
+  private boolean verifyTokenAsymmetric(OzoneBlockTokenIdentifier tokenId,
       byte[] signature, Certificate certificate) throws InvalidKeyException,
       NoSuchAlgorithmException, SignatureException {
     Signature rsaSignature = Signature.getInstance("SHA256withRSA");
     rsaSignature.initVerify(certificate);
     rsaSignature.update(tokenId.getBytes());
-    boolean isValid = rsaSignature.verify(signature);
-    return isValid;
+    return rsaSignature.verify(signature);
   }
 
   private byte[] signTokenSymmetric(OzoneBlockTokenIdentifier identifier,
@@ -215,7 +214,7 @@ private byte[] signTokenSymmetric(OzoneBlockTokenIdentifier identifier,
     return mac.doFinal(identifier.getBytes());
   }
 
-  OzoneBlockTokenIdentifier generateTestToken() {
+  private OzoneBlockTokenIdentifier generateTestToken() {
     return new OzoneBlockTokenIdentifier(RandomStringUtils.randomAlphabetic(6),
         RandomStringUtils.randomAlphabetic(5),
         EnumSet.allOf(HddsProtos.BlockTokenSecretProto.AccessModeProto.class),
@@ -223,7 +222,7 @@ OzoneBlockTokenIdentifier generateTestToken() {
   }
 
   @Test
-  public void testAsymmetricTokenPerf() throws NoSuchAlgorithmException,
+  void testAsymmetricTokenPerf() throws NoSuchAlgorithmException,
       CertificateEncodingException, NoSuchProviderException,
       InvalidKeyException, SignatureException {
     final int testTokenCount = 1000;
@@ -260,7 +259,7 @@ public void testAsymmetricTokenPerf() throws NoSuchAlgorithmException,
   }
 
   @Test
-  public void testSymmetricTokenPerf() {
+  void testSymmetricTokenPerf() {
     String hmacSHA1 = "HmacSHA1";
     String hmacSHA256 = "HmacSHA256";
 
@@ -268,7 +267,7 @@ public void testSymmetricTokenPerf() {
     testSymmetricTokenPerfHelper(hmacSHA256, 1024);
   }
 
-  public void testSymmetricTokenPerfHelper(String hmacAlgorithm, int keyLen) {
+  private void testSymmetricTokenPerfHelper(String hmacAlgorithm, int keyLen) {
     final int testTokenCount = 1000;
     List<OzoneBlockTokenIdentifier> tokenIds = new ArrayList<>();
     List<byte[]> tokenPasswordSym = new ArrayList<>();
@@ -302,11 +301,6 @@ public void testSymmetricTokenPerfHelper(String hmacAlgorithm, int keyLen) {
     }
     long duration = Time.monotonicNowNanos() - startTime;
     LOG.info("Average token sign time with {}({} symmetric key) is {} ns",
-        hmacAlgorithm, keyLen, duration / testTokenCount);
-  }
-
-  // TODO: verify certificate with a trust store
-  public boolean verifyCert(Certificate certificate) {
-    return true;
+        hmacAlgorithm, keyLen, duration / tokenPasswordSym.size());
   }
 }
diff --git a/hadoop-hdds/framework/dev-support/findbugsExcludeFile.xml b/hadoop-hdds/framework/dev-support/findbugsExcludeFile.xml
index a111802321e3..2f6d6d30eff2 100644
--- a/hadoop-hdds/framework/dev-support/findbugsExcludeFile.xml
+++ b/hadoop-hdds/framework/dev-support/findbugsExcludeFile.xml
@@ -29,8 +29,4 @@
     <Class name="org.apache.hadoop.hdds.utils.BufferedMetricsCollector$BufferedMetricsRecordBuilderImpl"></Class>
     <Bug pattern="URF_UNREAD_FIELD" />
   </Match>
-  <Match>
-    <Class name="org.apache.hadoop.hdds.security.token.TestOzoneBlockTokenIdentifier"></Class>
-    <Bug pattern="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE" />
-  </Match>
 </FindBugsFilter>
diff --git a/hadoop-hdds/hadoop-dependency-test/pom.xml b/hadoop-hdds/hadoop-dependency-test/pom.xml
index b379355d446d..a290a9e2bc64 100644
--- a/hadoop-hdds/hadoop-dependency-test/pom.xml
+++ b/hadoop-hdds/hadoop-dependency-test/pom.xml
@@ -54,6 +54,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>