diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index fccceb723ff..80c0226e11f 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-21  Simon Marchi  <simon.marchi@ericsson.com>
+
+	* lib/mi-support.exp (mi_run_cmd_full): Revert to original
+	behavior for $args, pass it directly to "run".
+
 2014-05-21  Maciej W. Rozycki  <macro@codesourcery.com>
 
 	* lib/gdb.exp (default_gdb_init): Bump `match_max' up from
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index afe13e83b10..6d011b9c357 100644
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -818,11 +818,9 @@ proc mi_run_cmd_full {use_mi_command args} {
     if {$use_mi_command} {
 	set run_prefix "220-exec-"
 	set run_match "220"
-	set set_args_cmd "-exec-arguments"
     } else {
 	set run_prefix ""
 	set run_match ""
-	set set_args_cmd "set args"
     }
 
     if [target_info exists gdb_init_command] {
@@ -864,16 +862,7 @@ proc mi_run_cmd_full {use_mi_command args} {
 	return 0
     }
 
-    send_gdb "${set_args_cmd} $args\n"
-    gdb_expect {
-	-re "$mi_gdb_prompt$" { }
-	default {
-	    perror "settings args failed"
-	    return -1
-	}
-    }
-
-    send_gdb "${run_prefix}run\n"
+    send_gdb "${run_prefix}run $args\n"
     gdb_expect {
 	-re "${run_match}\\^running\r\n(\\*running,thread-id=\"\[^\"\]+\"\r\n|=thread-created,id=\"1\",group-id=\"\[0-9\]+\"\r\n)*(${library_loaded_re})*(${thread_selected_re})?${mi_gdb_prompt}" {
 	}