diff --git a/CHANGES.txt b/CHANGES.txt
index 36b4df4a73..c712e63d11 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1018,6 +1018,9 @@ Trunk (unreleased changes)
     header would cause the reader to read the sync marker as a record. (Jay
     Booth via cdouglas)
 
+    HADOOP-6250. Modify test-patch to delete copied XML files before running
+    patch build. (Rahul Kumar Singh via yhemanth)
+
 Release 0.20.1 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/src/test/bin/test-patch.sh b/src/test/bin/test-patch.sh
index c2135bf522..86e7da7be0 100755
--- a/src/test/bin/test-patch.sh
+++ b/src/test/bin/test-patch.sh
@@ -254,6 +254,15 @@ checkTests () {
   return 0
 }
 
+cleanUpXml () {
+  cd $BASEDIR/conf
+  for file in `ls *.xml.template`
+    do
+      rm -f `basename $file .template`
+    done
+  cd $BASEDIR  
+}
+
 ###############################################################################
 ### Attempt to apply the patch
 applyPatch () {
@@ -682,6 +691,9 @@ checkAuthor
 RESULT=$?
 
 checkTests
+if [[ $HUDSON == "true" ]] ; then
+  cleanUpXml
+fi
 (( RESULT = RESULT + $? ))
 applyPatch
 if [[ $? != 0 ]] ; then