diff --git a/testenv/ChangeLog b/testenv/ChangeLog
index b722b38e..348aa8ed 100644
--- a/testenv/ChangeLog
+++ b/testenv/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-22  Darshit Shah  <darnir@gmail.com>
+
+	* (README): Remove old TODO and document SERVER_WAIT variable
+
 2014-06-22  Darshit Shah  <darnir@gmail.com>
 
 	* (conf.files_crawled): diff is a set object and needs explicit str
diff --git a/testenv/README b/testenv/README
index 6cd52a4a..c1e4297e 100644
--- a/testenv/README
+++ b/testenv/README
@@ -86,7 +86,11 @@ exceptions, please file a bug report at <bug-wget@gnu.org>
 Environment Variables:
 ================================================================================
 
-TODO: Set variables for ONLY_SERVER and WGET_PATH too.
+* SERVER_WAIT: Set this environment variable with a value for the number of
+  seconds the test should sleep between invoking the server and calling the Wget
+  executable. This is used when one would like to test a different version of
+  the executable or for running the test through external utilities like gdb and
+  valgrind.
 * NO_CLEANUP: Do not remove the temporary files created by the test.
   This will prevent the ${testname}-test directory from being deleted