diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5f196bb6422..a2a9d4ea577 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,4 +1,20 @@
+2004-02-27  Eric Christopher  <echristo@redhat.com>
+            Phil Edwards  <phil@codesourcery.com>
+
+	* testsuite/22_locale/collate/compare/wchar_t/2.cc,
+	testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc,
+	testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc,
+	testsuite/22_locale/collate/hash/wchar_t/2.cc,
+	testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc,
+	testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc,
+	testsuite/22_locale/collate/transform/wchar_t/2.cc,
+	testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc,
+	testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc:
+	Use dg-require-iconv.
+	* testsuite/lib/libstdc++.exp:  Load target-supports.exp.
+
 2004-02-27  Phil Edwards  <phil@codesourcery.com>
+            Eric Christopher  <echristo@redhat.com>
 
 	* testsuite/config/default.exp:  Update with comments.
 	(${tool}_target_compile):  New wrapper routine.
diff --git a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/2.cc
index e414718be8d..28c96055aef 100644
--- a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/2.cc
@@ -20,6 +20,7 @@
 
 // { dg-do run }
 // { dg-options "-finput-charset=ISO8859-1" }
+// { dg-require-iconv "ISO8859-1" }
 
 // 22.2.4.1.1 collate members
 
diff --git a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc
index 7f8c2870e0d..7c2cbca5e63 100644
--- a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_env.cc
@@ -22,6 +22,7 @@
 
 // { dg-do run }
 // { dg-options "-finput-charset=ISO8859-1" }
+// { dg-require-iconv "ISO8859-1" }
 
 #include <testsuite_hooks.h>
 
diff --git a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc
index 0b25d8ebb51..055abe4e2c0 100644
--- a/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/compare/wchar_t/wrapped_locale.cc
@@ -22,6 +22,7 @@
 
 // { dg-do run }
 // { dg-options "-finput-charset=ISO8859-1" }
+// { dg-require-iconv "ISO8859-1" }
 
 #include <testsuite_hooks.h>
 
diff --git a/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc
index 085d53bdf89..766ec03f89a 100644
--- a/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/2.cc
@@ -22,6 +22,7 @@
 
 // { dg-do run }
 // { dg-options "-finput-charset=ISO8859-1" }
+// { dg-require-iconv "ISO8859-1" }
 
 #include <locale>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc
index 7f8c2870e0d..7c2cbca5e63 100644
--- a/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_env.cc
@@ -22,6 +22,7 @@
 
 // { dg-do run }
 // { dg-options "-finput-charset=ISO8859-1" }
+// { dg-require-iconv "ISO8859-1" }
 
 #include <testsuite_hooks.h>
 
diff --git a/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc
index 0b25d8ebb51..055abe4e2c0 100644
--- a/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/hash/wchar_t/wrapped_locale.cc
@@ -22,6 +22,7 @@
 
 // { dg-do run }
 // { dg-options "-finput-charset=ISO8859-1" }
+// { dg-require-iconv "ISO8859-1" }
 
 #include <testsuite_hooks.h>
 
diff --git a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/2.cc b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/2.cc
index 9095520db1d..0373c35b1c9 100644
--- a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/2.cc
@@ -22,6 +22,7 @@
 
 // { dg-do run }
 // { dg-options "-finput-charset=ISO8859-1" }
+// { dg-require-iconv "ISO8859-1" }
 
 #include <locale>
 #include <testsuite_hooks.h>
diff --git a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc
index 3468dd8f75a..8a0a5570c16 100644
--- a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_env.cc
@@ -22,6 +22,7 @@
 
 // { dg-do run }
 // { dg-options "-finput-charset=ISO8859-1" }
+// { dg-require-iconv "ISO8859-1" }
 
 #include <testsuite_hooks.h>
 
diff --git a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc
index 477dbba2277..bcfc10f0aff 100644
--- a/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc
+++ b/libstdc++-v3/testsuite/22_locale/collate/transform/wchar_t/wrapped_locale.cc
@@ -22,6 +22,7 @@
 
 // { dg-do run }
 // { dg-options "-finput-charset=ISO8859-1" }
+// { dg-require-iconv "ISO8859-1" }
 
 #include <testsuite_hooks.h>
 
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 0700bc3558e..12c20885128 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -47,6 +47,7 @@ proc load_gcc_lib { filename } {
 load_lib dg.exp
 load_lib libgloss.exp
 # compiler routines, then ours
+load_gcc_lib target-supports.exp
 load_lib prune.exp
 load_lib dg-options.exp