diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index b0eb86f24bd..3bb966503b8 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -585,6 +585,9 @@ Release 2.1.0-beta - UNRELEASED
     HADOOP-9638. Parallel test changes caused invalid test path for several HDFS
     tests on Windows (Andrey Klochkov via cnauroth)
 
+    HADOOP-9632. TestShellCommandFencer will fail if there is a 'host' machine in
+    the network. (Chuan Liu via cnauroth)
+
   BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
 
     HADOOP-8924. Hadoop Common creating package-info.java must not depend on
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java
index 8a652b5b95e..6750b3b424e 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java
@@ -36,7 +36,7 @@ public class TestShellCommandFencer {
   private ShellCommandFencer fencer = createFencer();
   private static final HAServiceTarget TEST_TARGET =
       new DummyHAService(HAServiceState.ACTIVE,
-          new InetSocketAddress("host", 1234));
+          new InetSocketAddress("dummyhost", 1234));
   
   @BeforeClass
   public static void setupLogSpy() {
@@ -140,13 +140,13 @@ public class TestShellCommandFencer {
   @Test
   public void testTargetAsEnvironment() {
     if (!Shell.WINDOWS) {
-      fencer.tryFence(TEST_TARGET, "echo $target_host $target_port $target_address");
+      fencer.tryFence(TEST_TARGET, "echo $target_host $target_port");
       Mockito.verify(ShellCommandFencer.LOG).info(
-          Mockito.endsWith("echo $ta...t_address: host 1234 host:1234"));
+          Mockito.endsWith("echo $ta...rget_port: dummyhost 1234"));
     } else {
-      fencer.tryFence(TEST_TARGET, "echo %target_host% %target_port% %target_address%");
+      fencer.tryFence(TEST_TARGET, "echo %target_host% %target_port%");
       Mockito.verify(ShellCommandFencer.LOG).info(
-          Mockito.endsWith("echo %ta..._address%: host 1234 host:1234"));
+          Mockito.endsWith("echo %ta...get_port%: dummyhost 1234"));
     }
   }