diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9ba11922a5..4c4dcec693 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-09  Maciej W. Rozycki  <macro@codesourcery.com>
+	    Pedro Alves  <palves@redhat.com>
+
+	* gdb.mi/mi-info-os.exp: Connect to the target with
+        mi_gdb_target_load.
+
 2014-01-08  Pedro Alves  <palves@redhat.com>
 
 	* gdb.threads/reconnect-signal.c: New file.
diff --git a/gdb/testsuite/gdb.mi/mi-info-os.exp b/gdb/testsuite/gdb.mi/mi-info-os.exp
index dfc49d1ea4..aa6f4f1f59 100644
--- a/gdb/testsuite/gdb.mi/mi-info-os.exp
+++ b/gdb/testsuite/gdb.mi/mi-info-os.exp
@@ -33,6 +33,26 @@ if [mi_gdb_start] {
     continue
 }
 
+standard_testfile basics.c
+
+if [build_executable "Failed to build $testfile" $testfile $srcfile \
+	debug] {
+    return -1;
+}
+if {[mi_gdb_load $binfile] < 0} {
+    return -1
+}
+# When testing a cross configuration, we need to be sure to first
+# connect to the target.  If we didn't do that, GDB would try running
+# the command against the default run target.  The usual way to do
+# that and cover all targets is to run to main, with mi_run_to_main.
+# However, with native configurations, -info-os should work before
+# running any program, so we want to avoid "run".  Using
+# mi_gdb_target_load directly instead achieves this.
+if {[mi_gdb_target_load] < 0} {
+    return -1
+}
+
 # Try the argument-less form that lists all the types in a table.
 
 mi_gdb_test "-info-os" ".*\\^done,OSDataTable=.*" "-info-os"