diff --git a/README.rst b/README.rst
index 324010ef..82303d05 100644
--- a/README.rst
+++ b/README.rst
@@ -93,7 +93,7 @@ The following examples make use of a simple table
        `email` varchar(255) COLLATE utf8_bin NOT NULL,
        `password` varchar(255) COLLATE utf8_bin NOT NULL,
        PRIMARY KEY (`id`)
-   ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8_bin
+   ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin
    AUTO_INCREMENT=1 ;
 
 
diff --git a/docs/source/user/development.rst b/docs/source/user/development.rst
index 39c40e1a..09907318 100644
--- a/docs/source/user/development.rst
+++ b/docs/source/user/development.rst
@@ -30,7 +30,8 @@ and edit the new file to match your MySQL configuration::
 
 To run all the tests, execute the script ``runtests.py``::
 
-    $ python runtests.py
+    $ pip install pytest
+    $ pytest -v pymysql
 
 A ``tox.ini`` file is also provided for conveniently running tests on multiple
 Python versions::
diff --git a/docs/source/user/examples.rst b/docs/source/user/examples.rst
index 87af40c3..966d46bd 100644
--- a/docs/source/user/examples.rst
+++ b/docs/source/user/examples.rst
@@ -18,7 +18,7 @@ The following examples make use of a simple table
        `email` varchar(255) COLLATE utf8_bin NOT NULL,
        `password` varchar(255) COLLATE utf8_bin NOT NULL,
        PRIMARY KEY (`id`)
-   ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin
+   ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin
    AUTO_INCREMENT=1 ;
 
 
@@ -34,7 +34,7 @@ The following examples make use of a simple table
                                  charset='utf8mb4',
                                  cursorclass=pymysql.cursors.DictCursor)
 
-    try:
+    with connection:
         with connection.cursor() as cursor:
             # Create a new record
             sql = "INSERT INTO `users` (`email`, `password`) VALUES (%s, %s)"
@@ -50,8 +50,7 @@ The following examples make use of a simple table
             cursor.execute(sql, ('webmaster@python.org',))
             result = cursor.fetchone()
             print(result)
-    finally:
-        connection.close()
+
 
 This example will print:
 
diff --git a/docs/source/user/installation.rst b/docs/source/user/installation.rst
index d95961c6..0fea2726 100644
--- a/docs/source/user/installation.rst
+++ b/docs/source/user/installation.rst
@@ -18,13 +18,13 @@ Requirements
 
 * Python -- one of the following:
 
-  - CPython_ >= 2.7 or >= 3.5
-  - Latest PyPy_
+  - CPython_ >= 3.6
+  - Latest PyPy_ 3
 
 * MySQL Server -- one of the following:
 
-  - MySQL_ >= 5.5
-  - MariaDB_ >= 5.5
+  - MySQL_ >= 5.6
+  - MariaDB_ >= 10.0
 
 .. _CPython: http://www.python.org/
 .. _PyPy: http://pypy.org/