diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a5073f778063..ec3292ff1cee 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-29  Mark Mitchell  <mark@codesourcery.com>
+
+	* testsuite/25_algorithms/nth_element/2.cc: Constrain iterations
+	when testing on a simultor.
+
 2008-08-28  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* testsuite/tr1/6_containers/unordered_set/requirements/typedef.cc:
diff --git a/libstdc++-v3/testsuite/25_algorithms/nth_element/2.cc b/libstdc++-v3/testsuite/25_algorithms/nth_element/2.cc
index 84f959ae9a25..47084ad77a85 100644
--- a/libstdc++-v3/testsuite/25_algorithms/nth_element/2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/nth_element/2.cc
@@ -18,6 +18,12 @@
 
 // 25.3.2 [lib.alg.nth.element]
 
+// { dg-options "-DMAX_SIZE=256" { target simulator } }
+
+#ifndef MAX_SIZE
+#define MAX_SIZE (1 << 10)
+#endif
+
 #include <vector>
 #include <algorithm>
 #include <testsuite_hooks.h>
@@ -64,7 +70,7 @@ do_test01(unsigned size)
 void
 test01()
 {
-  for (unsigned size = 4; size <= 1 << 10; size <<= 1)
+  for (unsigned size = 4; size <= MAX_SIZE; size <<= 1)
     do_test01(size);
 }