diff --git a/CHANGELOG b/CHANGELOG
index 848305d..1e9801b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,10 +24,14 @@ v0.4 (unreleased):
 - If something goes wrong while parsing, ParserError will now be raised.
   Previously, the parser would produce an unclear BadRoute exception or allow
   an incorrect node tree to be build.
-- Fixed a parser bug involving nested tags, and another involving comments in
-  template names.
+- Fixed parser bugs involving:
+  - nested tags;
+  - comments in template names;
+  - tags inside of <nowiki> tags.
 - Added tests to ensure that parsed trees convert back to wikicode without
   unintentional modifications.
+- Added support for a NOWEB environment variable, which disables a unit test
+  that makes a web call.
 - Test coverage has been improved, and some minor related bugs have been fixed.
 - Updated and fixed some documentation.
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index a04410f..7ab211b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -35,10 +35,14 @@ Unreleased
 - If something goes wrong while parsing, :exc:`.ParserError` will now be
   raised. Previously, the parser would produce an unclear :exc:`.BadRoute`
   exception or allow an incorrect node tree to be build.
-- Fixed a parser bug involving nested tags, and another involving comments in
-  template names.
+- Fixed parser bugs involving:
+  - nested tags;
+  - comments in template names;
+  - tags inside of ``<nowiki>`` tags.
 - Added tests to ensure that parsed trees convert back to wikicode without
   unintentional modifications.
+- Added support for a :envvar:`NOWEB` environment variable, which disables a
+  unit test that makes a web call.
 - Test coverage has been improved, and some minor related bugs have been fixed.
 - Updated and fixed some documentation.
 
diff --git a/tests/test_docs.py b/tests/test_docs.py
index c873f0e..566a281 100644
--- a/tests/test_docs.py
+++ b/tests/test_docs.py
@@ -22,6 +22,7 @@
 
 from __future__ import print_function, unicode_literals
 import json
+import os
 
 try:
     import unittest2 as unittest
@@ -111,6 +112,7 @@ class TestDocs(unittest.TestCase):
         self.assertPrint(text, res)
         self.assertEqual(text, code)
 
+    @unittest.skipIf("NOWEB" in os.environ, "web test disabled by environ var")
     def test_readme_5(self):
         """test a block of example code in the README; includes a web call"""
         url1 = "http://en.wikipedia.org/w/api.php"