diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 18ddc59e3d..9b6a2a16d3 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-15  Ulrich Weigand  <ulrich.weigand@linaro.org>
+
+	* gdb.base/type-opaque.exp: Use gdb_load_shlibs.  Run test on
+	remote targets as well.
+
 2011-07-15  Ulrich Weigand  <ulrich.weigand@linaro.org>
 
 	* lib/gdb.exp (gdb_compile_shlib_pthreads): New helper.
diff --git a/gdb/testsuite/gdb.base/type-opaque.exp b/gdb/testsuite/gdb.base/type-opaque.exp
index d83e9521b1..8587351f2c 100644
--- a/gdb/testsuite/gdb.base/type-opaque.exp
+++ b/gdb/testsuite/gdb.base/type-opaque.exp
@@ -30,12 +30,6 @@ set execsrc "${srcdir}/${subdir}/${srcfile}"
 
 remote_exec build "rm -f ${binfile}"
 
-# Are we on a target board?  No support for downloading shared libraries
-# to a target yet.
-if ![isnative] then {
-    return 0
-}
-
 # get the value of gcc_compiled
 if [get_compiler_info ${binfile}] {
     return -1
@@ -51,6 +45,7 @@ gdb_exit
 gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
+gdb_load_shlibs ${libobj}
 
 if ![runto_main] then {
     fail "Can't run to main"