diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 6ca381b5cb..ef3980c539 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-31  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gdb.mi/mi-var-child.c (do_children_tests): Initialize
+	struct_declarations.
+	* gdb.mi/mi-var-child.exp: Step over the initialization of
+	struct_declarations.
+
 2005-07-31  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* gdb.mi/basics.c, gdb.mi/var-cmd.c: Revert last change.
diff --git a/gdb/testsuite/gdb.mi/mi-var-child.c b/gdb/testsuite/gdb.mi/mi-var-child.c
index 06b3e357ff..7686758a02 100644
--- a/gdb/testsuite/gdb.mi/mi-var-child.c
+++ b/gdb/testsuite/gdb.mi/mi-var-child.c
@@ -208,6 +208,7 @@ do_children_tests (void)
   int bar;
 
   struct _struct_decl struct_declarations;
+  memset (&struct_declarations, 0, sizeof (struct_declarations));
   weird = &struct_declarations;
 
   struct_declarations.integer = 123;
diff --git a/gdb/testsuite/gdb.mi/mi-var-child.exp b/gdb/testsuite/gdb.mi/mi-var-child.exp
index 63f49eddd8..3337d890a8 100644
--- a/gdb/testsuite/gdb.mi/mi-var-child.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-child.exp
@@ -47,6 +47,10 @@ mi_runto do_children_tests
 #                #
 #####        #####
 
+# Step past the initialization of struct_declarations.
+set line_weird [gdb_get_line_number "weird = &struct_declarations;"]
+mi_execute_to "exec-next" "end-stepping-range" do_children_tests {} ".*${srcfile}" \
+    [expr $line_weird] {} "step \$line_weird"
 
 # Test: c_variable-4.2
 # Desc: create variable "struct_declarations"