diff --git a/ChangeLog b/ChangeLog
index 04a2647d90..ac598984e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-07-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* iconvdata/tst-loading.c (TIMEOUT): Define to 30.
+	* misc/tst-tsearch.c (TIMEOUT): Remove.
+	* nptl/tst-create-detached.c (TIMEOUT): Define to 100.
+	* nptl/tst-robust-fork.c (TIMEOUT): Likewise.
+	* nptl/tst-rwlock19.c (TIMEOUT): Likewise.
+	* string/tst-cmp.c (TIMEOUT): Define to 600.
+
 2017-07-06  Matthew Krupcale  <mkrupcale@matthewkrupcale.com>
 
 	[BZ #21715]
diff --git a/iconvdata/tst-loading.c b/iconvdata/tst-loading.c
index 4aac51c7a4..4f343e67bc 100644
--- a/iconvdata/tst-loading.c
+++ b/iconvdata/tst-loading.c
@@ -181,5 +181,6 @@ do_test (void)
   return result;
 }
 
+#define TIMEOUT 30
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"
diff --git a/misc/tst-tsearch.c b/misc/tst-tsearch.c
index 6c8fff0e3f..5e3c473694 100644
--- a/misc/tst-tsearch.c
+++ b/misc/tst-tsearch.c
@@ -351,6 +351,5 @@ do_test (void)
   return total_error;
 }
 
-#define TIMEOUT 10
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"
diff --git a/nptl/tst-create-detached.c b/nptl/tst-create-detached.c
index ea93e441c7..551a845496 100644
--- a/nptl/tst-create-detached.c
+++ b/nptl/tst-create-detached.c
@@ -134,4 +134,5 @@ do_test (void)
   return 0;
 }
 
+#define TIMEOUT 100
 #include <support/test-driver.c>
diff --git a/nptl/tst-robust-fork.c b/nptl/tst-robust-fork.c
index 4a12ff000d..ec0fd3c42b 100644
--- a/nptl/tst-robust-fork.c
+++ b/nptl/tst-robust-fork.c
@@ -181,4 +181,5 @@ do_test (void)
   return 0;
 }
 
+#define TIMEOUT 100
 #include <support/test-driver.c>
diff --git a/nptl/tst-rwlock19.c b/nptl/tst-rwlock19.c
index 746d84d92f..47c6f43d9f 100644
--- a/nptl/tst-rwlock19.c
+++ b/nptl/tst-rwlock19.c
@@ -122,6 +122,6 @@ do_test (void)
   return 0;
 }
 
-#define TIMEOUT 30
+#define TIMEOUT 100
 #define TEST_FUNCTION do_test ()
 #include "../test-skeleton.c"
diff --git a/string/tst-cmp.c b/string/tst-cmp.c
index d7720194e9..7ddbd0b24e 100644
--- a/string/tst-cmp.c
+++ b/string/tst-cmp.c
@@ -207,6 +207,6 @@ do_test (void)
 
 /* The nested loops need a long time to complete on slower
    machines.  */
-#define TIMEOUT 300
+#define TIMEOUT 600
 
 #include <support/test-driver.c>