diff --git a/CHANGES.txt b/CHANGES.txt
index 45691e3..ce36ae7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -608,6 +608,8 @@
     HDFS-1953. Federation: Change name node mxbean name in cluster web 
     console. (Tanping Wang via suresh)
 
+    HDFS-1922. Fix recurring failure of TestJMXGet (Luke Lu via todd)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/build.xml b/build.xml
index 916764d..847402c 100644
--- a/build.xml
+++ b/build.xml
@@ -300,6 +300,9 @@
       <fileset dir="${conf.dir}" includes="**/*.template"/>
       <mapper type="glob" from="*.template" to="*"/>
     </copy>
+    <copy todir="${test.conf.dir}" verbose="true">
+      <fileset dir="${conf.dir}" includes="**/*.properties"/>
+    </copy>
 
     <copy todir="${contrib.dir}" verbose="true">
       <fileset dir="${contrib.dir}" includes="**/*.template"/>