2 files changed, 26 insertions, 3 deletions
diff --git a/tests/bugs/bug-1063230.t b/tests/bugs/bug-1063230.t
index f10a53433eb..a04be88e94e 100755
--- a/tests/bugs/bug-1063230.t
+++ b/tests/bugs/bug-1063230.t
@@ -18,9 +18,9 @@ var=`gluster volume rebalance $V0 start force`
 
 EXPECT "0" echo $?
 
-var1="Initiated rebalance on volume $V0. Execute \"gluster\
- volume rebalance <volume-name> status\" to check status"
-
+var1="volume rebalance: $V0: success: Rebalance on $V0 has \
+been started successfully. Use rebalance status command to \
+check status of the rebalance process."
 
 echo $var | grep "$var1"
 
diff --git a/tests/bugs/bug-1087487.t b/tests/bugs/bug-1087487.t
new file mode 100755
index 00000000000..d0cb0a32b4a
--- /dev/null
+++ b/tests/bugs/bug-1087487.t
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+. $(dirname $0)/../include.rc
+. $(dirname $0)/../volume.rc
+
+cleanup;
+
+function rebalance_start {
+         $CLI volume rebalance $1 start | head -1;
+}
+
+TEST glusterd
+TEST pidof glusterd
+
+TEST $CLI volume create $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1
+
+TEST $CLI volume start $V0
+
+EXPECT "volume rebalance: $V0: success: Rebalance on $V0 has \
+been started successfully. Use rebalance status command to \
+check status of the rebalance process." rebalance_start $V0
+
+cleanup;