diff --git a/CHANGES b/CHANGES
index 5df663ea..a1b2bdd8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -49,7 +49,7 @@ Version 1.0
   users debug when the wrong templates are loaded.
 - Enforce blueprint handling in the order they were registered for template
   loading.
-- Ported testsuite to py.test.
+- Ported test suite to py.test.
 - Deprecated ``request.json`` in favour of ``request.get_json()``.
 - Add "pretty" and "compressed" separators definitions in jsonify() method.
   Reduces JSON response size when JSONIFY_PRETTYPRINT_REGULAR=False by removing
diff --git a/docs/patterns/fabric.rst b/docs/patterns/fabric.rst
index e915103b..873bf47a 100644
--- a/docs/patterns/fabric.rst
+++ b/docs/patterns/fabric.rst
@@ -186,7 +186,7 @@ deployment actually fun:
     out the latest version on the server and then install.  That way you
     can also easily go back to older versions.
 -   hook in testing functionality so that you can deploy to an external
-    server and run the testsuite.
+    server and run the test suite.
 
 Working with Fabric is fun and you will notice that it's quite magical to
 type ``fab deploy`` and see your application being deployed automatically
diff --git a/docs/upgrading.rst b/docs/upgrading.rst
index fa32efb5..019019d0 100644
--- a/docs/upgrading.rst
+++ b/docs/upgrading.rst
@@ -96,7 +96,7 @@ as `ValueError` you will need to change this.
 
 Due to a bug in the test client Flask 0.7 did not trigger teardown
 handlers when the test client was used in a with statement.  This was
-since fixed but might require some changes in your testsuites if you
+since fixed but might require some changes in your test suites if you
 relied on this behavior.
 
 Version 0.7
diff --git a/flask/ctx.py b/flask/ctx.py
index 5e3ee4ed..d79ad00d 100644
--- a/flask/ctx.py
+++ b/flask/ctx.py
@@ -291,7 +291,7 @@ class RequestContext(object):
         # information under debug situations.  However if someone forgets to
         # pop that context again we want to make sure that on the next push
         # it's invalidated, otherwise we run at risk that something leaks
-        # memory.  This is usually only a problem in testsuite since this
+        # memory.  This is usually only a problem in test suite since this
         # functionality is not active in production environments.
         top = _request_ctx_stack.top
         if top is not None and top.preserved: