diff --git a/README.md b/README.md
index bd91c8fa..a573a858 100644
--- a/README.md
+++ b/README.md
@@ -72,21 +72,22 @@ documentation.
 ### Usage from the Python REPL
 
 A number of different transports are supported, but the simplest way to get
-started is with the python REPL. First, start Nvim with a known address (or use
-the `$NVIM_LISTEN_ADDRESS` of a running instance):
+started is with the python REPL. First, start Nvim with a known address:
 
 ```sh
-$ NVIM_LISTEN_ADDRESS=/tmp/nvim nvim
+$ nvim --listen /tmp/nvim.sock
 ```
 
+Or alternatively, note the `v:servername` address of a running Nvim instance.
+
 In another terminal, connect a python REPL to Nvim (note that the API is similar
 to the one exposed by the [python-vim
 bridge](http://vimdoc.sourceforge.net/htmldoc/if_pyth.html#python-vim)):
 
 ```python
 >>> import pynvim
-# Create a python API session attached to unix domain socket created above:
->>> nvim = pynvim.attach('socket', path='/tmp/nvim')
+# Create a session attached to Nvim's address (`v:servername`).
+>>> nvim = pynvim.attach('socket', path='/tmp/nvim.sock')
 # Now do some work.
 >>> buffer = nvim.current.buffer # Get the current buffer
 >>> buffer[0] = 'replace first line'
diff --git a/docs/development.rst b/docs/development.rst
index 43138d07..de08e769 100644
--- a/docs/development.rst
+++ b/docs/development.rst
@@ -7,7 +7,7 @@ If you change the code, you need to run::
 
 for the changes to have effect.
 
-Alternatively you could execute Neovim with the ``$PYTHONPATH`` environment variable::
+Alternatively you could execute Nvim with the ``$PYTHONPATH`` environment variable::
 
     PYTHONPATH=/path/to/pynvim nvim
 
@@ -15,13 +15,13 @@ But note this is not completely reliable,
 as installed packages can appear before ``$PYTHONPATH`` in the python search path.
 
 You need to rerun this command if you have changed the code,
-in order for Neovim to use it for the plugin host.
+in order for Nvim to use it for the plugin host.
 
 To run the tests execute::
 
     python -m pytest
 
-This will run the tests in an embedded instance of Neovim, with the current
+This will run the tests in an embedded instance of Nvim, with the current
 directory added to ``sys.path``.
 
 If you want to test a different version than ``nvim`` in ``$PATH`` use::
@@ -30,11 +30,11 @@ If you want to test a different version than ``nvim`` in ``$PATH`` use::
 
 Alternatively, if you want to see the state of nvim, you could use::
 
-    export NVIM_LISTEN_ADDRESS=/tmp/nvimtest
-    xterm -e "nvim -u NONE"&
+    export NVIM=/tmp/nvimtest
+    xterm -e "nvim --listen $NVIM -u NONE" &
     python -m pytest
 
-But note you need to restart Neovim every time you run the tests!
+But note you need to restart Nvim every time you run the tests!
 Substitute your favorite terminal emulator for ``xterm``.
 
 Contributing
@@ -58,7 +58,7 @@ If you have `tox`_, you can test with multiple python versions locally:
 Troubleshooting
 ---------------
 
-You can run the plugin host in Neovim with logging enabled to debug errors::
+You can run the plugin host in Nvim with logging enabled to debug errors::
 
     NVIM_PYTHON_LOG_FILE=logfile NVIM_PYTHON_LOG_LEVEL=DEBUG nvim
 
@@ -75,18 +75,18 @@ Usage through the Python REPL
 
 A number of different transports are supported,
 but the simplest way to get started is with the python REPL.
-First, start Neovim with a known address (or use the ``$NVIM_LISTEN_ADDRESS`` of a running instance)::
+First, start Nvim with a known address (or use the ``v:servername`` of a running instance)::
 
-    NVIM_LISTEN_ADDRESS=/tmp/nvim nvim
+    nvim --listen /tmp/nvim.sock
 
 In another terminal,
-connect a python REPL to Neovim (note that the API is similar to the one exposed by the `python-vim bridge`_):
+connect a python REPL to Nvim (note that the API is similar to the one exposed by the `python-vim bridge`_):
 
 .. code-block:: python
 
     >>> from pynvim import attach
-    # Create a python API session attached to unix domain socket created above:
-    >>> nvim = attach('socket', path='/tmp/nvim')
+    # Create a session attached to Nvim's address (`v:servername`).
+    >>> nvim = attach('socket', path='/tmp/nvim.sock')
     # Now do some work. 
     >>> buffer = nvim.current.buffer # Get the current buffer
     >>> buffer[0] = 'replace first line'
@@ -99,7 +99,7 @@ connect a python REPL to Neovim (note that the API is similar to the one exposed
 
 .. _`python-vim bridge`: http://vimdoc.sourceforge.net/htmldoc/if_pyth.html#python-vim
 
-You can embed Neovim into your python application instead of binding to a running neovim instance:
+You can embed Nvim into your python application instead of binding to a running neovim instance:
 
 .. code-block:: python
 
diff --git a/test/conftest.py b/test/conftest.py
index 4b032a24..49ed3305 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -19,7 +19,7 @@ def vim() -> Generator[pynvim.Nvim, None, None]:
     editor: pynvim.Nvim
 
     child_argv = os.environ.get('NVIM_CHILD_ARGV')
-    listen_address = os.environ.get('NVIM_LISTEN_ADDRESS')
+    listen_address = os.environ.get('NVIM')
     if child_argv is None and listen_address is None:
         child_argv = json.dumps([
             "nvim",