diff --git a/_pytest/freeze_support.py b/_pytest/freeze_support.py
index 97147a882..52b84eb49 100644
--- a/_pytest/freeze_support.py
+++ b/_pytest/freeze_support.py
@@ -7,7 +7,7 @@ from __future__ import absolute_import, division, print_function
 
 def freeze_includes():
     """
-    Returns a list of module names used by py.test that should be
+    Returns a list of module names used by pytest that should be
     included by cx_freeze.
     """
     import py
diff --git a/_pytest/pytester.py b/_pytest/pytester.py
index c14a34d7e..27dd8289d 100644
--- a/_pytest/pytester.py
+++ b/_pytest/pytester.py
@@ -714,7 +714,7 @@ class Testdir(object):
         """
         finalizers = []
         try:
-            # When running py.test inline any plugins active in the main test
+            # When running pytest inline any plugins active in the main test
             # process are already imported.  So this disables the warning which
             # will trigger to say they can no longer be rewritten, which is
             # fine as they have already been rewritten.
@@ -725,7 +725,7 @@ class Testdir(object):
             finalizers.append(revert_warn_already_imported)
             AssertionRewritingHook._warn_already_imported = lambda *a: None
 
-            # Any sys.module or sys.path changes done while running py.test
+            # Any sys.module or sys.path changes done while running pytest
             # inline should be reverted after the test run completes to avoid
             # clashing with later inline tests run within the same pytest test,
             # e.g. just because they use matching test module names.
diff --git a/doc/en/cache.rst b/doc/en/cache.rst
index 10543ef3b..57a091116 100644
--- a/doc/en/cache.rst
+++ b/doc/en/cache.rst
@@ -234,7 +234,7 @@ Inspecting Cache content
 You can always peek at the content of the cache using the
 ``--cache-show`` command line option::
 
-    $ py.test --cache-show
+    $ pytest --cache-show
     =========================== test session starts ============================
     platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
     rootdir: $REGENDOC_TMPDIR, inifile:
diff --git a/doc/en/example/pythoncollection.rst b/doc/en/example/pythoncollection.rst
index fc8dbf1b5..58b4364b5 100644
--- a/doc/en/example/pythoncollection.rst
+++ b/doc/en/example/pythoncollection.rst
@@ -54,7 +54,7 @@ Keeping duplicate paths specified from command line
 Default behavior of ``pytest`` is to ignore duplicate paths specified from the command line.
 Example::
 
-    py.test path_a path_a
+    pytest path_a path_a
 
     ...
     collected 1 item
@@ -65,7 +65,7 @@ Just collect tests once.
 To collect duplicate tests, use the ``--keep-duplicates`` option on the cli.
 Example::
 
-    py.test --keep-duplicates path_a path_a
+    pytest --keep-duplicates path_a path_a
 
     ...
     collected 2 items
@@ -75,7 +75,7 @@ As the collector just works on directories, if you specify twice a single test f
 still collect it twice, no matter if the ``--keep-duplicates`` is not specified.
 Example::
 
-    py.test test_a.py test_a.py
+    pytest test_a.py test_a.py
 
     ...
     collected 2 items