diff --git a/setup.py b/setup.py
index 92482c03..7e185a5d 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@
     packages=find_packages(include=["gql*"]),
     install_requires=[
         'six>=1.10.0',
-        'graphql-core>=0.5.0,<2',
+        'graphql-core>=2,<3',
         'promise>=2.0,<3',
         'requests>=2.12,<3'
     ],
diff --git a/tests/starwars/schema.py b/tests/starwars/schema.py
index da2d88d8..655f2871 100644
--- a/tests/starwars/schema.py
+++ b/tests/starwars/schema.py
@@ -63,7 +63,7 @@
         'friends': GraphQLField(
             GraphQLList(characterInterface),
             description='The friends of the human, or an empty list if they have none.',
-            resolver=lambda human, *_: getFriends(human),
+            resolver=lambda human, info, **args: getFriends(human),
         ),
         'appearsIn': GraphQLField(
             GraphQLList(episodeEnum),
@@ -92,7 +92,7 @@
         'friends': GraphQLField(
             GraphQLList(characterInterface),
             description='The friends of the droid, or an empty list if they have none.',
-            resolver=lambda droid, *_: getFriends(droid),
+            resolver=lambda droid, info, **args: getFriends(droid),
         ),
         'appearsIn': GraphQLField(
             GraphQLList(episodeEnum),
@@ -118,7 +118,7 @@
                     type=episodeEnum,
                 )
             },
-            resolver=lambda root, args, *_: getHero(args.get('episode')),
+            resolver=lambda root, info, **args: getHero(args.get('episode')),
         ),
         'human': GraphQLField(
             humanType,
@@ -128,7 +128,7 @@
                     type=GraphQLNonNull(GraphQLString),
                 )
             },
-            resolver=lambda root, args, *_: getHuman(args['id']),
+            resolver=lambda root, info, **args: getHuman(args['id']),
         ),
         'droid': GraphQLField(
             droidType,
@@ -138,7 +138,7 @@
                     type=GraphQLNonNull(GraphQLString),
                 )
             },
-            resolver=lambda root, args, *_: getDroid(args['id']),
+            resolver=lambda root, info, **args: getDroid(args['id']),
         ),
     }
 )