diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7cdebce569f..a2eaf0f8f16 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-11  Phil Edwards  <pme@gcc.gnu.org>
+
+	* testsuite/21_strings/capacity.cc:  Only explicitly instantiate on
+	platforms with no weak support.
+	* testsuite/27_io/ios_init.cc:  Likewise.
+
 2002-03-10  Paolo Carlini  <pcarlini@unitus.it>
 
 	* include/bits/locale_facets.tcc (time_put::do_put):
diff --git a/libstdc++-v3/testsuite/21_strings/capacity.cc b/libstdc++-v3/testsuite/21_strings/capacity.cc
index c8f78890f9b..3bfb051e0a2 100644
--- a/libstdc++-v3/testsuite/21_strings/capacity.cc
+++ b/libstdc++-v3/testsuite/21_strings/capacity.cc
@@ -188,6 +188,7 @@ bool test02()
   return test;
 }
 
+#if !__GXX_WEAK__
 // Explicitly instantiate for systems with no COMDAT or weak support.
 template 
   std::basic_string< A<B> >::size_type 
@@ -196,6 +197,7 @@ template
 template 
   A<B>
   std::basic_string< A<B> >::_Rep::_S_terminal;
+#endif
 
 int main()
 {
diff --git a/libstdc++-v3/testsuite/27_io/ios_init.cc b/libstdc++-v3/testsuite/27_io/ios_init.cc
index 7cef9cce683..38d2e522822 100644
--- a/libstdc++-v3/testsuite/27_io/ios_init.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_init.cc
@@ -132,6 +132,7 @@ void test02()
   VERIFY( test );
 }
 
+#if !__GXX_WEAK__
 // Explicitly instantiate for systems with no COMDAT or weak support.
 template 
   std::basic_string<unsigned short>::size_type 
@@ -140,6 +141,7 @@ template
 template 
   unsigned short
   std::basic_string<unsigned short>::_Rep::_S_terminal;
+#endif
 
 int main()
 {