diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 359e79d2d023..1cfd17d40d2d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,21 @@
+2006-06-26  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc:
+	Reduce iterations by half.
+	* testsuite/ext/pb_ds/regression/hash_data_map_rand.cc: Same.
+	* testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc: Same.
+	* testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc: Same.
+	* testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc: Same.
+	* testsuite/ext/pb_ds/regression/priority_queue_rand.cc: Same.
+	* testsuite/ext/pb_ds/regression/tree_data_map_rand.cc: Same.
+	* testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc: Same.
+	* testsuite/ext/pb_ds/regression/trie_data_map_rand.cc: Same.
+
+	* testsuite/util/regression/rand/assoc/rand_regression_test.hpp:
+	Set probability of compare from 1 to 0.25.
+	* testsuite/util/regression/rand/priority_queue/
+	rand_regression_test.hpp: Same.
+
 2006-06-25  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/tr1/random (operator<<(std::basic_ostream<>&,
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_data_map_rand.cc
index 06c51f53d1c4..d9814830b7e1 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_data_map_rand.cc
@@ -54,7 +54,7 @@ main(int argc, char* a_p_argv[])
   using namespace pb_ds::test;
   typedef hash_map_tl_t map_tl_t;
 
-  return rand_regression_test(10000, 10000,
+  return rand_regression_test(5000, 10000,
 			      "hash_data_map_rand_regression_test",
 			      map_tl_t());
 }
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc
index 50bf33344cde..76753ad01144 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/hash_no_data_map_rand.cc
@@ -54,7 +54,7 @@ main(int argc, char* a_p_argv[])
   using namespace pb_ds::test;
   typedef hash_set_tl_t map_tl_t;
 
-  return rand_regression_test(10000, 10000,
+  return rand_regression_test(5000, 10000,
 			      "hash_no_data_map_rand_regression_test",
 			      map_tl_t());
 }
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc
index d184844f1ae7..98bbf59cf556 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_data_map_rand.cc
@@ -54,7 +54,7 @@ main(int argc, char* a_p_argv[])
   using namespace pb_ds::test;
   typedef lu_map_tl_t map_tl_t;
 
-  return rand_regression_test(100, 10, 
+  return rand_regression_test(50, 10, 
 			      "lu_data_map_rand_regression_test",
 			      map_tl_t());
 }
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc
index ae70c1ea6a34..90e0de038c29 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/list_update_no_data_map_rand.cc
@@ -54,7 +54,7 @@ main(int argc, char* a_p_argv[])
   using namespace pb_ds::test;
   typedef lu_set_tl_t map_tl_t;
 
-  return rand_regression_test(100, 10,
+  return rand_regression_test(50, 10,
 			      "lu_no_data_map_rand_regression_test",
 			      map_tl_t());
 }
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc
index 6266e13d0ca3..aae3971fa2de 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/priority_queue_rand.cc
@@ -52,7 +52,7 @@ int
 main(int argc, char* a_p_argv[])
 {
   using namespace pb_ds::test;
-  return rand_regression_test(10000, 10000,
+  return rand_regression_test(5000, 10000,
 			      "tree_no_data_map_rand_regression_test", 
 			      pq_tl_t());
 }
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_data_map_rand.cc
index 4a51facf4390..8ffabd22a53c 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_data_map_rand.cc
@@ -54,7 +54,7 @@ main(int argc, char* a_p_argv[])
   using namespace pb_ds::test;
   typedef tree_map_tl_t map_tl_t;
 
-  return rand_regression_test(10000, 10000,
+  return rand_regression_test(5000, 10000,
 			      "tree_data_map_rand_regression_test",
 			      map_tl_t());
 }
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc
index 4d3c8ff510f4..57fe8dcff9fb 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/tree_no_data_map_rand.cc
@@ -54,7 +54,7 @@ main(int argc, char* a_p_argv[])
   using namespace pb_ds::test;
   typedef tree_set_tl_t map_tl_t;
 
-  return rand_regression_test(10000, 10000,
+  return rand_regression_test(5000, 10000,
 			      "tree_no_data_map_rand_regression_test",
 			      map_tl_t());
 }
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_data_map_rand.cc
index e6841970cbdb..fa64607d1a35 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_data_map_rand.cc
@@ -54,7 +54,7 @@ main(int argc, char* a_p_argv[])
   using namespace pb_ds::test;
   typedef trie_map_tl_t map_tl_t;
 
-  return rand_regression_test(10000, 10000,
+  return rand_regression_test(5000, 10000,
 			      "trie_data_map_rand_regression_test",
 			      map_tl_t());
 }
diff --git a/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc b/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc
index b8af58cdb8ba..eec51dfa0170 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/regression/trie_no_data_map_rand.cc
@@ -54,7 +54,7 @@ main(int argc, char* a_p_argv[])
   using namespace pb_ds::test;
   typedef trie_set_tl_t map_tl_t;
 
-  return rand_regression_test(10000, 10000,
+  return rand_regression_test(5000, 10000,
 			      "trie_no_data_map_rand_regression_test", 
 			      map_tl_t());
 }
diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/rand_regression_test.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/rand_regression_test.hpp
index 6f6bafa861bd..2a169434977b 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/assoc/rand_regression_test.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/rand_regression_test.hpp
@@ -113,7 +113,7 @@ namespace detail
     double ip = 0.6;
     double ep = 0.2; 
     double cp = 0.001;
-    double mp = 1;
+    double mp = 0.25;
     bool disp = false; // show progress
 
     try
diff --git a/libstdc++-v3/testsuite/util/regression/rand/priority_queue/rand_regression_test.hpp b/libstdc++-v3/testsuite/util/regression/rand/priority_queue/rand_regression_test.hpp
index ebd6d33c8d25..31b912fc95dd 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/priority_queue/rand_regression_test.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/priority_queue/rand_regression_test.hpp
@@ -115,7 +115,7 @@ namespace detail
     double dp = 0.1;
     double ep = 0.2; 
     double cp = 0.001;
-    double mp = 1;
+    double mp = 0.25;
     bool disp = false; // show progress
 
     try