diff --git a/gdb/testsuite/gdb.mi/ChangeLog-mi b/gdb/testsuite/gdb.mi/ChangeLog-mi
index 0802adf27a..cbe0e4f0ac 100644
--- a/gdb/testsuite/gdb.mi/ChangeLog-mi
+++ b/gdb/testsuite/gdb.mi/ChangeLog-mi
@@ -1,3 +1,9 @@
+2001-01-20  Mark Kettenis  <kettenis@gnu.org>
+
+	* mi-support.exp (mi_gdb_start): Skip mi tests if -i flag is
+	recognized (i.e. if GDB was compiled with UI_OUT, but the mi
+	interpreter wasn't recognized (because it wasn't compiled in).
+
 Tue Apr 18 15:36:07 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 
 	* Makefile.in (clean mostlyclean): Do not delete $(MISCELLANEOUS).
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index 6b3e3e7e68..d4c4cf007b 100644
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -135,6 +135,11 @@ proc mi_gdb_start { } {
 	    remote_close host;
 	    return -1;
 	}
+	-re ".*Interpreter `mi' unrecognized." {
+	    untested "Skip mi tests (not compiled with mi support)."
+	    remote_close host;
+	    return -1;
+	}
 	timeout {
 	    perror "(timeout) GDB never initialized after 10 seconds."
 	    remote_close host;