diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 094964b6..378b31ca 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -12,6 +12,7 @@ Changelog
   super class.
 - Completion for "proxies" works now. These are classes that have a
   ``__getattr__(self, name)`` method that does a ``return getattr(x, name)``.
+- Understanding of Pytest fixtures.
 - Big **Script API Changes**:
     - The line and column parameters of ``jedi.Script`` are now deprecated
     - ``completions`` deprecated, use ``complete`` instead
diff --git a/docs/docs/features.rst b/docs/docs/features.rst
index 693e3cdd..943fcebe 100644
--- a/docs/docs/features.rst
+++ b/docs/docs/features.rst
@@ -52,6 +52,7 @@ Supported Python Features
 - ``isinstance`` checks for if/while/assert
 - namespace packages (includes ``pkgutil``, ``pkg_resources`` and PEP420 namespaces)
 - Django / Flask / Buildout support
+- Understands Pytest fixtures
 
 
 Not Supported