diff --git a/.travis.yml b/.travis.yml
index 1a28d29b..41a4cdcf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,9 @@ python:
   - 3.3
   - 3.4
   - 3.5
+  - 3.6
   - nightly
-  # - pypy Disabled for pypy < 2.6.0
+  - pypy
 
 install:
   - pip install .
diff --git a/setup.py b/setup.py
index bda863f7..830e2db0 100644
--- a/setup.py
+++ b/setup.py
@@ -40,16 +40,21 @@ def run_tests(self):
 
 ROOT = os.path.dirname(__file__)
 
-tests_requirements = [
-    "pyquery", "flask", "cairosvg",
-    'pytest-runner', 'pytest-cov', 'pytest-flake8', 'pytest-isort',
-    'pytest'
-]
 
 # Explicitly specify the encoding of pygal/__init__.py if we're on py3.
 kwargs = {}
 if sys.version_info[0] == 3:
     kwargs['encoding'] = 'utf-8'
+    cairosvg = 'cairosvg'
+else:
+    cairosvg = 'cairosvg==0.5'
+
+tests_requirements = [
+    "pyquery", "flask", cairosvg,
+    'pytest-runner', 'pytest-cov', 'pytest-flake8', 'pytest-isort',
+    'pytest'
+]
+
 
 with open(os.path.join(ROOT, 'pygal', '__init__.py'), **kwargs) as fd:
     __version__ = re.search("__version__ = '([^']+)'", fd.read()).group(1)