diff --git a/common/src/test/java/org/apache/falcon/util/ApplicationPropertiesTest.java b/common/src/test/java/org/apache/falcon/util/ApplicationPropertiesTest.java
index 2a131d79f..c22b6ad1f 100644
--- a/common/src/test/java/org/apache/falcon/util/ApplicationPropertiesTest.java
+++ b/common/src/test/java/org/apache/falcon/util/ApplicationPropertiesTest.java
@@ -22,6 +22,7 @@
 import org.apache.falcon.security.CredentialProviderHelper;
 import org.apache.hadoop.conf.Configuration;
 import org.testng.Assert;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
 
 import java.io.File;
@@ -39,13 +40,23 @@ public class ApplicationPropertiesTest {
     private static final String PROPERTY_2 = "property-key-2";
     private static final String JKS_FILE_NAME = "credentials.jks";
 
+    private static final File credDir = new File(".");
+
+    @AfterClass
+    public void tearDown() throws Exception {
+        // delete temporary jks files
+        File file = new File(credDir, JKS_FILE_NAME);
+        file.delete();
+        file = new File(credDir, "." + JKS_FILE_NAME + ".crc");
+        file.delete();
+    }
+
     @Test
     public void testResolveAlias() throws Exception {
         // hadoop credential provider needs to be available
         Assert.assertTrue(CredentialProviderHelper.isProviderAvailable());
 
         // clean credential provider store
-        File credDir = new File(".");
         File file = new File(credDir, JKS_FILE_NAME);
         file.delete();