diff --git a/CHANGES.txt b/CHANGES.txt
index 598a4937295..3ce4aef229b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -18,6 +18,8 @@ HBase Change Log
    HBASE-409   Add build path to svn:ignore list (Edward Yoon via Stack)
    HBASE-408   Add .classpath and .project to svn:ignore list
                (Edward Yoon via Stack)
+   HBASE-410   Speed up the test suite (make test timeout 5 minutes instead of
+               15.
 
 Branch 0.1
 
diff --git a/build.xml b/build.xml
index a34a5390660..9307567325e 100644
--- a/build.xml
+++ b/build.xml
@@ -38,7 +38,7 @@
   <property name="docs.dir" value="${basedir}/docs"/>
 
   <property name="test.output" value="no"/>
-  <property name="test.timeout" value="900000"/>
+  <property name="test.timeout" value="300000"/>
 
   <property name="build.dir" location="${basedir}/build"/>
   <property name="build.bin" location="${build.dir}/bin"/>