diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 385c982c88d..ea60d928e8b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2009-08-18  DJ Delorie  <dj@redhat.com>
 
+	* lib/wrapper.exp: Move load of target-libpath.exp from here...
+	* lib/gcc-defs.exp: ... to here.
+
 	* lib/wrapper.exp (${tool}_maybe_build_wrapper): Set up
 	GCC_EXEC_PREFIX before building the wrapper.
 
diff --git a/gcc/testsuite/lib/gcc-defs.exp b/gcc/testsuite/lib/gcc-defs.exp
index 53926a69a23..776456d6092 100644
--- a/gcc/testsuite/lib/gcc-defs.exp
+++ b/gcc/testsuite/lib/gcc-defs.exp
@@ -14,6 +14,8 @@
 # along with GCC; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 
+load_lib target-libpath.exp
+
 load_lib wrapper.exp
 
 #
diff --git a/gcc/testsuite/lib/wrapper.exp b/gcc/testsuite/lib/wrapper.exp
index fba7324ece4..b7f7773aac5 100644
--- a/gcc/testsuite/lib/wrapper.exp
+++ b/gcc/testsuite/lib/wrapper.exp
@@ -16,8 +16,6 @@
 
 # This file contains GCC-specifics for status wrappers for test programs.
 
-load_lib target-libpath.exp
-
 # ${tool}_maybe_build_wrapper -- Build wrapper object if the target
 # needs it.  FILENAME is the path to the wrapper file.  If there are
 # additional arguments, they are command-line options to provide to