diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 5d25d0dbe2f..a2ffc594dd5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -569,6 +569,9 @@ Release 2.6.0 - UNRELEASED
     HDFS-7107. Avoid Findbugs warning for synchronization on
     AbstractNNFailoverProxyProvider#fallbackToSimpleAuth. (cnauroth)
 
+    HDFS-7109. TestDataStorage does not release file locks between tests.
+    (cnauroth)
+
 Release 2.5.1 - 2014-09-05
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataStorage.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataStorage.java
index 1d700e3cdfc..ed322437da9 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataStorage.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataStorage.java
@@ -63,6 +63,7 @@ public class TestDataStorage {
 
   @After
   public void tearDown() throws IOException {
+    storage.unlockAll();
     FileUtil.fullyDelete(TEST_DIR);
   }