diff --git a/CHANGES.txt b/CHANGES.txt
index 1f5243d0d7f..26038277820 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -999,6 +999,9 @@ Release 0.21.0 - Unreleased
 
   BUG FIXES
 
+    HADOOP-6828. Herrior uses old way of accessing logs directories (Sreekanth
+    Ramakrishnan via cos)
+
     HADOOP-6788. [Herriot] Exception exclusion functionality is not working
     correctly. (Vinay Thota via cos)
 
diff --git a/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj b/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj
index f009c538087..23860d2bfbd 100644
--- a/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj
+++ b/src/test/system/aop/org/apache/hadoop/test/system/DaemonProtocolAspect.aj
@@ -245,8 +245,8 @@ public aspect DaemonProtocolAspect {
   public String DaemonProtocol.getFilePattern() {
     //We use the environment variable HADOOP_LOGFILE to get the
     //pattern to use in the search.
-    String logDir = System.getenv("HADOOP_LOG_DIR");
-    String daemonLogPattern = System.getenv("HADOOP_LOGFILE");
+    String logDir = System.getProperty("hadoop.log.dir");
+    String daemonLogPattern = System.getProperty("hadoop.log.file");
     if(daemonLogPattern == null && daemonLogPattern.isEmpty()) {
       return "*";
     }