diff --git a/.travis.yml b/.travis.yml
index 89fa7c9..e740852 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ python:
   - 2.7
   - 3.4
   - 3.5
+  - 3.6
 
 install:
   - sudo apt-get update -y
diff --git a/barbeque/anylink.py b/barbeque/anylink.py
index 76459cd..ff09af0 100644
--- a/barbeque/anylink.py
+++ b/barbeque/anylink.py
@@ -2,7 +2,10 @@
 
 from anylink.extensions import BaseLink
 from cms.models.fields import PageField
-from cms.utils import get_cms_setting
+try:
+    from cms.utils import get_cms_setting_
+except ImportError:
+    from cms.utils.conf import get_cms_setting
 from django.conf import settings
 from django.core.cache import cache
 from django.db import models
diff --git a/barbeque/tests/test_commands.py b/barbeque/tests/test_commands.py
index fbf3f63..80aa87a 100644
--- a/barbeque/tests/test_commands.py
+++ b/barbeque/tests/test_commands.py
@@ -58,7 +58,7 @@ def test_failing_oserror_py3(self):
 
         assert exc.value.code == 1
         assert exc.value.command == cmd
-        assert exc.value.stderr == (
+        assert exc.value.stderr.startswith(
             "[Errno 2] No such file or directory: 'thiscommanddoesnotexist'")
 
     def test_failing_return_value(self):
diff --git a/setup.py b/setup.py
index a7d1f37..dec6192 100644
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,7 @@ def patched_os_walk(path, *args, **kwargs):
     'Pillow==4.2.1',
     'django-anylink==0.4.2',
     'django-treebeard==4.1.2',
-    'django-cms==3.4.4',
+    'django-cms==3.5.2',
     'django-polymorphic==1.3',
     'django-compressor==2.2',
     'django-filer==1.2.8',
diff --git a/tox.ini b/tox.ini
index 6599c41..f45a802 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,20 +1,19 @@
 [tox]
 skipsdist = True
-envlist={py27,py34}-django18,{py27,py34}-django{19,110},py35-django111
+envlist={py27,py34,py35,py36}-django111,{py34,py35,py36}-django20
 
 [tox:travis]
 2.7 = py27
 3.4 = py34
 3.5 = py35
+3.6 = py36
 
 [testenv]
 skip_install = True
 setenv = PYTHONPATH={toxinidir}
 deps =
 	.[tests]
-	django18: Django>=1.8,<1.9
-	django19: Django>=1.9,<1.10
-	django110: Django>=1.10,<1.11
 	django111: Django>=1.11,<2.0
+	django20: Django>=2.0,<2.1
 commands =
 	py.test --cov