--- a/CHANGES.html	Fri Oct 09 20:52:19 2009 -0700
+++ b/CHANGES.html	Fri Oct 09 21:18:24 2009 -0700
@@ -48,6 +48,13 @@
 
 <h2>Changes to build system:</h2>
 <ul>
+<li><b>A new test framework is provided with ns-3.6 that primarilay runs outside waf</b>
+<p>"./waf check" now runs the new unit tests of the core part of ns-3.6.  
+In order to run the complete test package, use "./test.py" which is 
+documented in a new manual -- find it in ./doc/testing.  "./waf check"
+no longer generates the introspected Doxygen.  Now use "./waf doxygen"
+to do this and generate the Doxygen documentation in one step.
+</p>
 </ul>
 
 <h2>New API:</h2>
@@ -124,6 +131,14 @@
 </p>
 </li>
 
+<li><b>New Test Framework</b>
+<p> Add TestCase, TestSuite classes
+<ul>
+<li> examples: src/core/names-test-suite.cc, src/core/random-number-test-suite.cc, src/test/ns3tcp/ns3tcp-cwnd-test-suite.cc
+</ul> 
+</p>
+</li>
+
 </ul>
 
 <h2>Changes to existing API:</h2>

--- a/RELEASE_NOTES	Fri Oct 09 20:52:19 2009 -0700
+++ b/RELEASE_NOTES	Fri Oct 09 21:18:24 2009 -0700
@@ -63,6 +63,11 @@
     - Ipv4NixVectorHelper
     - Examples (nix-simple, nms-p2p-nix)
 
+  e) New Test Framework
+    - Use test.py instead of ./waf check or ./waf --regression
+    - Previous unit tests have been ported to new framework.
+    - Examples are tested for run-ability.
+
 API changes from ns-3.5
 -----------------------
 API changes for this release are documented in the file CHANGES.html.