diff --git a/.travis.yml b/.travis.yml
index 98bec53..ca5648f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,14 +6,16 @@ env:
     - TOX_ENV=py27-dj16
     - TOX_ENV=py27-dj17
     - TOX_ENV=py27-dj18
+    - TOX_ENV=py27-dj19
+    - TOX_ENV=py27-dj110
+    - TOX_ENV=py27-dj111
     - TOX_ENV=py34-dj15
     - TOX_ENV=py34-dj16
     - TOX_ENV=py34-dj17
     - TOX_ENV=py34-dj18
-
-python:
-  - "2.7"
-  - "3.4"
+    - TOX_ENV=py34-dj19
+    - TOX_ENV=py34-dj110
+    - TOX_ENV=py34-dj111
 
 install:
   - pip install tox coverage coveralls
diff --git a/bootstrapform/templatetags/bootstrap.py b/bootstrapform/templatetags/bootstrap.py
index 71512aa..9fa4c5c 100644
--- a/bootstrapform/templatetags/bootstrap.py
+++ b/bootstrapform/templatetags/bootstrap.py
@@ -1,3 +1,4 @@
+import django
 from django import forms, VERSION as django_version
 from django.template import Context
 from django.template.loader import get_template
@@ -60,7 +61,7 @@ def render(element, markup_classes):
     if element_type == 'boundfield':
         add_input_classes(element)
         template = get_template("bootstrapform/field.html")
-        context = Context({'field': element, 'classes': markup_classes, 'form': element.form})
+        context = {'field': element, 'classes': markup_classes, 'form': element.form}
     else:
         has_management = getattr(element, 'management_form', None)
         if has_management:
@@ -69,13 +70,17 @@ def render(element, markup_classes):
                     add_input_classes(field)
 
             template = get_template("bootstrapform/formset.html")
-            context = Context({'formset': element, 'classes': markup_classes})
+            context = {'formset': element, 'classes': markup_classes}
         else:
             for field in element.visible_fields():
                 add_input_classes(field)
 
             template = get_template("bootstrapform/form.html")
-            context = Context({'form': element, 'classes': markup_classes})
+            context = {'form': element, 'classes': markup_classes}
+
+
+    if django_version < (1, 11):
+        context = Context(context)
 
     if django_version >= (1, 8):
         context = context.flatten()
diff --git a/tox.ini b/tox.ini
index 360df6d..2408c32 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py34}-dj{15,16,17,18,19,110}
+envlist = {py27,py34}-dj{15,16,17,18,19,110,111}
 skipsdist=True
 
 
@@ -15,6 +15,7 @@ deps =
     dj18: django>=1.8,<1.9
     dj19: django>=1.9,<1.10
     dj110: django>=1.10,<1.11
+    dj111: django>=1.10,<1.11
 commands = python setup.py test