diff --git a/CHANGES.txt b/CHANGES.txt
index 3429eeb5fbb..7a795cba91e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -76,6 +76,9 @@ Trunk (unreleased changes)
 
     HADOOP-7166. Add DaemonFactory to common. (Erik Steffl & jitendra)
 
+    HADOOP-7167. Amend previous commit under this JIRA to fix issue on
+    cygwin. (todd)
+
   OPTIMIZATIONS
 
   BUG FIXES
diff --git a/build.xml b/build.xml
index 8a73385279d..68a18ebed45 100644
--- a/build.xml
+++ b/build.xml
@@ -95,7 +95,7 @@
   <property name="test.core.build.classes" value="${test.build.dir}/core/classes"/>
 
   <property name="test.all.tests.file" value="${test.src.dir}/all-tests"/>
-  <property name="test.exclude.file" value="/dev/null" />
+  <property name="test.exclude.file" value="${test.src.dir}/empty-file" />
 
   <property name="javadoc.link.java"
 	    value="http://java.sun.com/javase/6/docs/api/"/>
@@ -1455,6 +1455,7 @@
         <exclude name="**/VERSION"/>
         <exclude name="**/*.json"/>
         <exclude name="**/hod/*.txt"/>
+        <exclude name="src/test/empty-file" />
       </fileset>
     </rat:report>
   </target>
diff --git a/src/test/empty-file b/src/test/empty-file
new file mode 100644
index 00000000000..e69de29bb2d