diff --git a/ChangeLog b/ChangeLog
index c9cdcf4e1a..fbdbb44a3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-02-19  Mike Frysinger  <vapier@gentoo.org>
+
+	* test-skeleton.c (TIMEOUT): Change to 20 and adjust comment.
+
 2016-02-19  Carlos O'Donell  <carlos@systemhalted.org>
 
 	* nptl/allocatestack.c (allocate_stack): Declare new stackaddr,
diff --git a/test-skeleton.c b/test-skeleton.c
index a2edf836b7..a2d90a298f 100644
--- a/test-skeleton.c
+++ b/test-skeleton.c
@@ -46,8 +46,9 @@
 #endif
 
 #ifndef TIMEOUT
-  /* Default timeout is two seconds.  */
-# define TIMEOUT 2
+  /* Default timeout is twenty seconds.  Tests should normally complete faster
+     than this, but if they don't, that's abnormal (a bug) anyways.  */
+# define TIMEOUT 20
 #endif
 
 #define OPT_DIRECT 1000