diff --git a/.travis.yml b/.travis.yml
index 824cf2f..bb85770 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,12 +6,12 @@ matrix:
     env: TOX_ENV=pypy
   - python: '2.7'
     env: TOX_ENV=py27
-  - python: '3.3'
-    env: TOX_ENV=py33
   - python: '3.4'
     env: TOX_ENV=py34
   - python: '3.5'
-    env: TOX_ENV=py35,import-order,flake8
+    env: TOX_ENV=py35
+  - python: '3.6'
+    env: TOX_ENV=py36,import-order,flake8
 cache:
   directories:
   - $HOME/.cache/pip
diff --git a/tests/schema.py b/tests/schema.py
index 742ca09..0506638 100644
--- a/tests/schema.py
+++ b/tests/schema.py
@@ -12,15 +12,15 @@ def resolve_raises(*_):
     fields={
         'thrower': GraphQLField(GraphQLNonNull(GraphQLString), resolver=resolve_raises),
         'request': GraphQLField(GraphQLNonNull(GraphQLString),
-                                resolver=lambda obj, args, context, info: context.args.get('q')),
+                                resolver=lambda obj, info: info.context.args.get('q')),
         'context': GraphQLField(GraphQLNonNull(GraphQLString),
-                                resolver=lambda obj, args, context, info: context),
+                                resolver=lambda obj, info: info.context),
         'test': GraphQLField(
             type=GraphQLString,
             args={
                 'who': GraphQLArgument(GraphQLString)
             },
-            resolver=lambda obj, args, context, info: 'Hello %s' % (args.get('who') or 'World')
+            resolver=lambda obj, info, who=None: 'Hello %s' % (who or 'World')
         )
     }
 )
diff --git a/tox.ini b/tox.ini
index 407f02c..6055569 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = flake8,import-order,py35,py27,py33,py34,pypy
+envlist = flake8,import-order,py36,py27,py34,py35,pypy
 skipsdist = true
 
 [testenv]
@@ -13,16 +13,16 @@ deps =
     Flask>=0.10.0
     pytest-cov
 commands =
-    py{py,27,33,34,35}: py.test tests {posargs}
+    py{py,27,34,35,36}: py.test tests {posargs}
 
 [testenv:flake8]
-basepython=python3.5
+basepython=python3.6
 deps = flake8
 commands =
     flake8 flask_graphql
 
 [testenv:import-order]
-basepython=python3.5
+basepython=python3.6
 deps =
     isort
     graphql-core>=1.0