diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 51504a02d02..dbd90ddb17a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2016-08-17  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* inferior.c (remove_inferior_command): Fix error message.
+
 2016-08-17  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* inferior.c (exit_inferior_1): Remove comment.
diff --git a/gdb/inferior.c b/gdb/inferior.c
index 6507ae77db1..47d91c7037e 100644
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -803,7 +803,7 @@ remove_inferior_command (char *args, int from_tty)
 
       if (inf == current_inferior ())
 	{
-	  warning (_("Can not remove current symbol inferior %d."), num);
+	  warning (_("Can not remove current inferior %d."), num);
 	  continue;
 	}
     
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6e01da285aa..d025133d9eb 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-08-17  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* gdb.multi/remove-inferiors.exp (test_remove_inferiors): Fix
+	expected error message.
+
 2016-08-17  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* gdb.multi/remove-inferiors.exp: New file.
diff --git a/gdb/testsuite/gdb.multi/remove-inferiors.exp b/gdb/testsuite/gdb.multi/remove-inferiors.exp
index c49b31d4e99..d46beec0a9d 100644
--- a/gdb/testsuite/gdb.multi/remove-inferiors.exp
+++ b/gdb/testsuite/gdb.multi/remove-inferiors.exp
@@ -40,7 +40,7 @@ proc test_remove_inferiors { } {
 
     # Test that it is not possible to remove the current inferior.
     gdb_test "remove-inferiors 2" \
-	     "warning: Can not remove current symbol inferior 2." \
+	     "warning: Can not remove current inferior 2." \
 	     "can't remove current inferior"
 
     # Test that it is possible to remove a non-active non-current inferior.