diff --git a/NEWS b/NEWS
index f3d1e29..634a054 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ Gnuk NEWS - User visible changes
 
   Released 2012-0X-XX, by NIIBE Yutaka
 
+** Test suite
+
 ** New tool: stlinkv2.py
 This tool is SWD flash ROM writer with ST-Link/V2.
 
diff --git a/test/README b/test/README
index 6ead706..4c38942 100644
--- a/test/README
+++ b/test/README
@@ -3,15 +3,18 @@ This is functionality test suite for Gnuk.
 You need python-nose, python-freshen as well as python-usb.
 
 Besides, python-crypto is needed when you use generate_keys.py to
-update *.key.
+update contents of *.key.
 
 
 Type:
 
-  $ nosetests --with-freshen .
+  $ nosetests --with-freshen
 
 or
 
-  $ nosetests -v --with-freshen .
+  $ nosetests -v --with-freshen
 
 to run the test suite.
+
+To skip tests for key generation, add an option "--tag ~keygen".  To
+stop running tests after the first error or failure, add "--stop option".