@@ -1,12 +1,12 @@
 # vim: sw=2 ts=2 sts=2 expandtab
 
-sudo: required
+dist: xenial
 language: python
+cache: pip
+
 services:
   - docker
 
-cache: pip
-
 matrix:
   include:
     - env:
@@ -17,7 +17,7 @@ matrix:
       python: "3.6"
     - env:
         - DB=mariadb:10.1
-      python: "pypy"
+      python: "pypy3.5"
     - env:
         - DB=mariadb:10.2
       python: "2.7"
@@ -32,7 +32,7 @@ matrix:
       python: "3.6"
     - env:
         - DB=mysql:5.7
-      python: "3.4"
+      python: "3.7"
     - env:
         - DB=mysql:8.0
         - TEST_AUTH=yes
 
@@ -38,7 +38,7 @@ Requirements
 
 * Python -- one of the following:
 
-  - CPython_ : 2.7 and >= 3.4
+  - CPython_ : 2.7 and >= 3.5
   - PyPy_ : Latest version
 
 * MySQL Server -- one of the following:
 
@@ -18,7 +18,7 @@ Requirements
 
 * Python -- one of the following:
 
-  - CPython_ >= 2.7 or >= 3.4
+  - CPython_ >= 2.7 or >= 3.5
   - Latest PyPy_
 
 * MySQL Server -- one of the following:
 
@@ -301,46 +301,6 @@ def convert_date(obj):
         return obj
 
 
-def convert_mysql_timestamp(timestamp):
-    """Convert a MySQL TIMESTAMP to a Timestamp object.
-
-    MySQL >= 4.1 returns TIMESTAMP in the same format as DATETIME:
-
-      >>> mysql_timestamp_converter('2007-02-25 22:32:17')
-      datetime.datetime(2007, 2, 25, 22, 32, 17)
-
-    MySQL < 4.1 uses a big string of numbers:
-
-      >>> mysql_timestamp_converter('20070225223217')
-      datetime.datetime(2007, 2, 25, 22, 32, 17)
-
-    Illegal values are returned as None:
-
-      >>> mysql_timestamp_converter('2007-02-31 22:32:17') is None
-      True
-      >>> mysql_timestamp_converter('00000000000000') is None
-      True
-
-    """
-    if not PY2 and isinstance(timestamp, (bytes, bytearray)):
-        timestamp = timestamp.decode('ascii')
-    if timestamp[4] == '-':
-        return convert_datetime(timestamp)
-    timestamp += "0"*(14-len(timestamp)) # padding
-    year, month, day, hour, minute, second = \
-        int(timestamp[:4]), int(timestamp[4:6]), int(timestamp[6:8]), \
-        int(timestamp[8:10]), int(timestamp[10:12]), int(timestamp[12:14])
-    try:
-        return datetime.datetime(year, month, day, hour, minute, second)
-    except ValueError:
-        return timestamp
-
-def convert_set(s):
-    if isinstance(s, (bytes, bytearray)):
-        return set(s.split(b","))
-    return set(s.split(","))
-
-
 def through(x):
     return x
 
@@ -388,11 +348,10 @@ def through(x):
     FIELD_TYPE.LONGLONG: int,
     FIELD_TYPE.INT24: int,
     FIELD_TYPE.YEAR: int,
-    FIELD_TYPE.TIMESTAMP: convert_mysql_timestamp,
+    FIELD_TYPE.TIMESTAMP: convert_datetime,
     FIELD_TYPE.DATETIME: convert_datetime,
     FIELD_TYPE.TIME: convert_timedelta,
     FIELD_TYPE.DATE: convert_date,
-    FIELD_TYPE.SET: convert_set,
     FIELD_TYPE.BLOB: through,
     FIELD_TYPE.TINY_BLOB: through,
     FIELD_TYPE.MEDIUM_BLOB: through,
 
@@ -99,11 +99,6 @@ def _map_error(exc, *errors):
 
 def raise_mysql_exception(data):
     errno = struct.unpack('<h', data[1:3])[0]
-    is_41 = data[3:4] == b"#"
-    if is_41:
-        # client protocol 4.1
-        errval = data[9:].decode('utf-8', 'replace')
-    else:
-        errval = data[3:].decode('utf-8', 'replace')
+    errval = data[9:].decode('utf-8', 'replace')
     errorclass = error_map.get(errno, InternalError)
     raise errorclass(errno, errval)
@@ -9,12 +9,6 @@
 class TestRaiseException(unittest2.TestCase):
 
     def test_raise_mysql_exception(self):
-        data = b"\xff\x15\x04Access denied"
-        with self.assertRaises(err.OperationalError) as cm:
-            err.raise_mysql_exception(data)
-        self.assertEqual(cm.exception.args, (1045, 'Access denied'))
-
-    def test_raise_mysql_exception_client_protocol_41(self):
         data = b"\xff\x15\x04#28000Access denied"
         with self.assertRaises(err.OperationalError) as cm:
             err.raise_mysql_exception(data)
 
@@ -25,7 +25,6 @@
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',