diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMetrics.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMetrics.java
index 5f9b60267c5..355f7a1e753 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMetrics.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMetrics.java
@@ -258,10 +258,9 @@ public void testTimeoutMetric() throws Exception {
    * and reading causes totalReadTime to move.
    * @throws Exception
    */
-  @Test(timeout=60000)
+  @Test(timeout=120000)
   public void testDataNodeTimeSpend() throws Exception {
     Configuration conf = new HdfsConfiguration();
-    SimulatedFSDataset.setFactory(conf);
     MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).build();
     try {
       final FileSystem fs = cluster.getFileSystem();
@@ -284,6 +283,7 @@ public Boolean get() {
             DFSTestUtil.createFile(fs, new Path("/time.txt." + x.get()),
                 LONG_FILE_LEN, (short) 1, Time.monotonicNow());
             DFSTestUtil.readFile(fs, new Path("/time.txt." + x.get()));
+            fs.delete(new Path("/time.txt." + x.get()), true);
           } catch (IOException ioe) {
             LOG.error("Caught IOException while ingesting DN metrics", ioe);
             return false;
@@ -294,7 +294,7 @@ public Boolean get() {
           return endWriteValue > startWriteValue
               && endReadValue > startReadValue;
         }
-      }, 30, 30000);
+      }, 30, 60000);
     } finally {
       if (cluster != null) {
         cluster.shutdown();