diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f33663b2a64..3c0d6aa40ba 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2401,7 +2401,7 @@ Bug fixes:
   teardown function are called earlier.
 - add an all-powerful metafunc.parametrize function which allows to
   parametrize test function arguments in multiple steps and therefore
-  from indepdenent plugins and palces.
+  from independent plugins and places.
 - add a @pytest.mark.parametrize helper which allows to easily
   call a test function with different argument values
 - Add examples to the "parametrize" example page, including a quick port
diff --git a/_pytest/cacheprovider.py b/_pytest/cacheprovider.py
index 0657001f2d4..893f0eae543 100755
--- a/_pytest/cacheprovider.py
+++ b/_pytest/cacheprovider.py
@@ -1,7 +1,7 @@
 """
 merged implementation of the cache provider
 
-the name cache was not choosen to ensure pluggy automatically
+the name cache was not chosen to ensure pluggy automatically
 ignores the external pytest-cache
 """
 
diff --git a/_pytest/hookspec.py b/_pytest/hookspec.py
index b5f51eccf50..f01235455ec 100644
--- a/_pytest/hookspec.py
+++ b/_pytest/hookspec.py
@@ -255,7 +255,7 @@ def pytest_assertrepr_compare(config, op, left, right):
     Return None for no custom explanation, otherwise return a list
     of strings.  The strings will be joined by newlines but any newlines
     *in* a string will be escaped.  Note that all but the first line will
-    be indented sligthly, the intention is for the first line to be a summary.
+    be indented slightly, the intention is for the first line to be a summary.
     """
 
 # -------------------------------------------------------------------------
diff --git a/_pytest/main.py b/_pytest/main.py
index a3235279397..b66b661c81c 100644
--- a/_pytest/main.py
+++ b/_pytest/main.py
@@ -81,7 +81,7 @@ def pytest_namespace():
 
 
 def pytest_configure(config):
-    pytest.config = config # compatibiltiy
+    pytest.config = config # compatibility
 
 
 def wrap_session(config, doit):
diff --git a/_pytest/mark.py b/_pytest/mark.py
index 357a60492e4..d406bca6b6f 100644
--- a/_pytest/mark.py
+++ b/_pytest/mark.py
@@ -66,7 +66,7 @@ def pytest_collection_modifyitems(items, config):
         return
     # pytest used to allow "-" for negating
     # but today we just allow "-" at the beginning, use "not" instead
-    # we probably remove "-" alltogether soon
+    # we probably remove "-" altogether soon
     if keywordexpr.startswith("-"):
         keywordexpr = "not " + keywordexpr[1:]
     selectuntil = False
diff --git a/_pytest/pytester.py b/_pytest/pytester.py
index 6c63bbbbf5e..25f7c5de7e0 100644
--- a/_pytest/pytester.py
+++ b/_pytest/pytester.py
@@ -566,7 +566,7 @@ def mkdir(self, name):
     def mkpydir(self, name):
         """Create a new python package.
 
-        This creates a (sub)direcotry with an empty ``__init__.py``
+        This creates a (sub)directory with an empty ``__init__.py``
         file so that is recognised as a python package.
 
         """
@@ -661,7 +661,7 @@ def inline_runsource(self, source, *cmdlineargs):
     def inline_genitems(self, *args):
         """Run ``pytest.main(['--collectonly'])`` in-process.
 
-        Retuns a tuple of the collected items and a
+        Returns a tuple of the collected items and a
         :py:class:`HookRecorder` instance.
 
         This runs the :py:func:`pytest.main` function to run all of
@@ -857,7 +857,7 @@ def getmodulecol(self,  source, configargs=(), withinit=False):
            :py:meth:`parseconfigure`.
 
         :param withinit: Whether to also write a ``__init__.py`` file
-           to the temporarly directory to ensure it is a package.
+           to the temporary directory to ensure it is a package.
 
         """
         kw = {self.request.function.__name__: Source(source).strip()}
diff --git a/_pytest/python.py b/_pytest/python.py
index 2973d43d699..3e865e9df6b 100644
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -629,7 +629,7 @@ def collect(self):
     def getcallargs(self, obj):
         if not isinstance(obj, (tuple, list)):
             obj = (obj,)
-        # explict naming
+        # explicit naming
         if isinstance(obj[0], py.builtin._basestring):
             name = obj[0]
             obj = obj[1:]
diff --git a/_pytest/unittest.py b/_pytest/unittest.py
index 34eb9885bee..276b9ba1621 100644
--- a/_pytest/unittest.py
+++ b/_pytest/unittest.py
@@ -5,7 +5,7 @@
 import traceback
 
 import pytest
-# for transfering markers
+# for transferring markers
 import _pytest._code
 from _pytest.python import transfer_markers
 from _pytest.skipping import MarkEvaluator
diff --git a/testing/test_assertion.py b/testing/test_assertion.py
index 9115d25e2f6..dfc9f60fb65 100644
--- a/testing/test_assertion.py
+++ b/testing/test_assertion.py
@@ -364,7 +364,7 @@ def test_iterable_full_diff(self, left, right, expected):
         expl = '\n'.join(callequal(left, right, verbose=True))
         assert expl.endswith(textwrap.dedent(expected).strip())
 
-    def test_list_different_lenghts(self):
+    def test_list_different_lengths(self):
         expl = callequal([0, 1], [0, 1, 2])
         assert len(expl) > 1
         expl = callequal([0, 1, 2], [0, 1])
diff --git a/testing/test_assertrewrite.py b/testing/test_assertrewrite.py
index fdf674f25cc..7cc58e8a8fd 100644
--- a/testing/test_assertrewrite.py
+++ b/testing/test_assertrewrite.py
@@ -271,7 +271,7 @@ def f():
 
         getmsg(f, must_pass=True)
 
-    def test_short_circut_evaluation(self):
+    def test_short_circuit_evaluation(self):
         def f():
             assert True or explode  # noqa
 
diff --git a/testing/test_capture.py b/testing/test_capture.py
index cbb5fc81bb7..763e28315df 100644
--- a/testing/test_capture.py
+++ b/testing/test_capture.py
@@ -604,7 +604,7 @@ def test_foo():
 
 
 def test_error_during_readouterr(testdir):
-    """Make sure we suspend capturing if errors occurr during readouterr"""
+    """Make sure we suspend capturing if errors occur during readouterr"""
     testdir.makepyfile(pytest_xyz="""
         from _pytest.capture import FDCapture
         def bad_snap(self):
diff --git a/testing/test_session.py b/testing/test_session.py
index a7dcb27a4e1..f494dbc1140 100644
--- a/testing/test_session.py
+++ b/testing/test_session.py
@@ -197,7 +197,7 @@ def test_minus_x_import_error(self, testdir):
         colfail = [x for x in finished if x.failed]
         assert len(colfail) == 1
 
-    def test_minus_x_overriden_by_maxfail(self, testdir):
+    def test_minus_x_overridden_by_maxfail(self, testdir):
         testdir.makepyfile(__init__="")
         testdir.makepyfile(test_one="xxxx", test_two="yyyy", test_third="zzz")
         reprec = testdir.inline_run("-x", "--maxfail=2", testdir.tmpdir)
diff --git a/tox.ini b/tox.ini
index e57fabd4b45..1b9fb9f5a08 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion=2.0
 distshare={homedir}/.tox/distshare
-# make sure to update enviroment list on appveyor.yml
+# make sure to update environment list on appveyor.yml
 envlist=
      linting
      py26