diff --git a/.testr.conf b/.testr.conf
index 6d049ac46f..38e8927a57 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,6 +1,7 @@
 [DEFAULT]
 test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
              OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
+             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-600} \
              ${PYTHON:-python} -m subunit.run discover ceilometer $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list