diff --git a/.travis.yml b/.travis.yml
index 48245f5..545b79b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,40 @@
 sudo: false
 language: python
-python:
-- '2.7'
+
+services:
+  - mysql
+
 install:
-- pip install tox
-env:
-- TOX_ENV=py27-test
-- TOX_ENV=py33-test
-- TOX_ENV=py34-test
+  - pip install tox
+
+matrix:
+  include:
+    - stage: test
+      python: 2.7
+      env: TOX_ENV=py27
+    - stage: test
+      python: 3.3
+      env: TOX_ENV=py33
+    - stage: test
+      python: 3.4
+      env: TOX_ENV=py34
+    - stage: test
+      python: 3.5
+      env: TOX_ENV=py35
+    - stage: test
+      python: 3.6
+      env: TOX_ENV=py36
+    - stage: deploy
+      script: skip
+      deploy:
+        provider: pypi
+        user: mattbennett
+        password:
+          secure: "nS/snIn4e/AWu3yrpzDLPXB+wHXXVU0qLdf07ldUxBx3lJ5K4ggqM1o6huP+ny2lZM6Q+jlRaYj0L6Tb/pppC7Pimx+dni9EFHXvLVO5sLD80+qV/AQPf7tbdWY6FWBV8kMGpXPwdnbKRGnQ17nerBJUfvL0dxigGoAqpOgwxppw/qNk0J3ay2AUnKUnWUKUXgATBLH72MSW6/iT84asIV6jOlfmRLpFKiO42emyBmYTo/TwM6lkjLG465gI2oWc/2sVTR6rkq00Yz5AC3Ry/pUZYfg55M3hTgHSQ54qtd/7IlbsP9inYTiZGsYkDaHlKsM1DdXreApVIo7LzRfCblMGrGvQfZm3BVMmmOWGSzM9dqBOXxjVcG9xHoG4/jzxGJ40gXX4cRS0AgkAWak2Q34QKj30FIBeLrZNzpDUmyPrKFBkfLi8CR8pW06m0Kxs3XWoUvP7ajVocbGnQHXQpz4q7FoKmnXhg0u9XyJTdtZAMt/h7aN9Bb2N0Zfasex025dB93Z2qLmwMVYkwQhIxjfw4vCstq9t+q67JKDMP4O6T7ektJ1Qt2TNR2BEr0/V/r5uplH5qyNH8PKL5YV9afyI+f1Dbdk+8wsRBGFJOm+rHg/JLtkzpTjNeAy4VYsYb8R+1rRe9IyBR7ti0mpW22lemhAHUUdaaol7mZm5yTI="
+        on:
+          tags: true
+          repo: Overseas-Student-Living/sqlalchemy-diff
+        distributions: "sdist bdist_wheel"
+
 script:
-- tox -e $TOX_ENV
-deploy:
-  provider: pypi
-  user: mattbennett
-  password:
-    secure: nS/snIn4e/AWu3yrpzDLPXB+wHXXVU0qLdf07ldUxBx3lJ5K4ggqM1o6huP+ny2lZM6Q+jlRaYj0L6Tb/pppC7Pimx+dni9EFHXvLVO5sLD80+qV/AQPf7tbdWY6FWBV8kMGpXPwdnbKRGnQ17nerBJUfvL0dxigGoAqpOgwxppw/qNk0J3ay2AUnKUnWUKUXgATBLH72MSW6/iT84asIV6jOlfmRLpFKiO42emyBmYTo/TwM6lkjLG465gI2oWc/2sVTR6rkq00Yz5AC3Ry/pUZYfg55M3hTgHSQ54qtd/7IlbsP9inYTiZGsYkDaHlKsM1DdXreApVIo7LzRfCblMGrGvQfZm3BVMmmOWGSzM9dqBOXxjVcG9xHoG4/jzxGJ40gXX4cRS0AgkAWak2Q34QKj30FIBeLrZNzpDUmyPrKFBkfLi8CR8pW06m0Kxs3XWoUvP7ajVocbGnQHXQpz4q7FoKmnXhg0u9XyJTdtZAMt/h7aN9Bb2N0Zfasex025dB93Z2qLmwMVYkwQhIxjfw4vCstq9t+q67JKDMP4O6T7ektJ1Qt2TNR2BEr0/V/r5uplH5qyNH8PKL5YV9afyI+f1Dbdk+8wsRBGFJOm+rHg/JLtkzpTjNeAy4VYsYb8R+1rRe9IyBR7ti0mpW22lemhAHUUdaaol7mZm5yTI=
-  on:
-    tags: true
-    repo: Overseas-Student-Living/sqlalchemy-diff
-  distributions: "sdist bdist_wheel"
+  - tox -e $TOX_ENV
diff --git a/Makefile b/Makefile
index 289ed14..4b38a01 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 test: flake8 pylint pytest
 
 pylint:
-	pylint sqlalchemydiff -E
+	pylint sqlalchemydiff -E --disable=E1102
 
 flake8:
 	flake8 sqlalchemydiff test
diff --git a/setup.py b/setup.py
index 801da14..1e8a90e 100644
--- a/setup.py
+++ b/setup.py
@@ -24,13 +24,10 @@
         "six>=1.10.0",
         "sqlalchemy-utils>=0.32.4",
     ],
-    dependency_links=[
-        'https://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.1.4.zip'
-    ],
     extras_require={
         'dev': [
             "mock==2.0.0",
-            "mysql-connector-python==2.1.4",
+            "mysql-connector-python-rf==2.2.2",
             "pytest==3.0.3",
             "pylint==1.5.1",
             "flake8==3.0.4",
@@ -51,6 +48,8 @@
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
         "Topic :: Internet",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Intended Audience :: Developers",
diff --git a/tox.ini b/tox.ini
index 833cd8e..c4b08c3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
-envlist = {py27,py33,py34}-test
+envlist = {py27,py33,py34,py35,py36}-test
 skipdist=True
 
 [testenv]
 whitelist_externals = make
 
 commands =
-    pip install --editable .[dev] --process-dependency-links
+    pip install --editable .[dev]
     make test