diff --git a/setup.py b/setup.py
index 1a41d5668..241aa73d6 100755
--- a/setup.py
+++ b/setup.py
@@ -114,7 +114,7 @@ setup(name="authentic2",
           'django-model-utils>=2.4',
           'dnspython>=1.10',
           'Django-Select2>5,<6',
-          'django-tables2>=1.0,<1.1',
+          'django-tables2>=1.0,<2.0',
           'gadjo>=0.53',
           'django-import-export>=0.2.7',
           'djangorestframework>=3.3,<3.4',
diff --git a/src/authentic2/manager/tables.py b/src/authentic2/manager/tables.py
index 9d71fbec3..4de252585 100644
--- a/src/authentic2/manager/tables.py
+++ b/src/authentic2/manager/tables.py
@@ -113,9 +113,9 @@ class OuUserRolesTable(tables.Table):
                              kwargs={'pk': A('pk')},
                              accessor='name', verbose_name=_('label'))
     via = tables.TemplateColumn(
-        '''{% for rel in row.record.via %}{{ rel.child }} {% if not forloop.last %}, {% endif %}{% endfor %}''',
+        '''{% for rel in record.via %}{{ rel.child }} {% if not forloop.last %}, {% endif %}{% endfor %}''',
         verbose_name=_('Inherited from'), orderable=False)
-    member = tables.TemplateColumn('''{% load i18n %}<input class="role-member{% if not row.record.member and row.record.via %} indeterminate{% endif %}" name='role-{{ row.record.pk }}' type='checkbox' {% if row.record.member %}checked{% endif %} {% if not row.record.has_perm %}disabled title="{% trans "You are not authorized to manage this role" %}"{% endif %}/>''',
+    member = tables.TemplateColumn('''{% load i18n %}<input class="role-member{% if not record.member and record.via %} indeterminate{% endif %}" name='role-{{ record.pk }}' type='checkbox' {% if record.member %}checked{% endif %} {% if not record.has_perm %}disabled title="{% trans "You are not authorized to manage this role" %}"{% endif %}/>''',
                                   verbose_name=_('Member'), order_by=('member', 'via', 'name'))
 
 
@@ -132,7 +132,7 @@ class UserRolesTable(tables.Table):
                              accessor='name', verbose_name=_('label'))
     ou = tables.Column()
     via = tables.TemplateColumn(
-        '''{% if not row.record.member %}{% for rel in row.record.child_relation.all %}{{ rel.child }} {% if not forloop.last %}, {% endif %}{% endfor %}{% endif %}''',
+        '''{% if not record.member %}{% for rel in record.child_relation.all %}{{ rel.child }} {% if not forloop.last %}, {% endif %}{% endfor %}{% endif %}''',
         verbose_name=_('Inherited from'), orderable=False)
 
     class Meta:
diff --git a/tox.ini b/tox.ini
index c79a961ba..5fc364285 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,7 +27,9 @@ usedevelop =
 deps = 
   pip > 9
   dj18: django>1.8,<1.9
+  dj18: django-tables2<1.1
   dj111: django<2.0
+  dj111: django-tables<2.0
   pg: psycopg2
   coverage
   pytest-cov