diff --git a/lib/graphql/libgraphqlparser.rb b/lib/graphql/libgraphqlparser.rb
index 52e1c59..ccaef17 100644
--- a/lib/graphql/libgraphqlparser.rb
+++ b/lib/graphql/libgraphqlparser.rb
@@ -10,22 +10,28 @@ def self.parse(string)
       begin
         builder = builder_parse(string)
         builder.document
-      rescue ArgumentError
+      rescue ArgumentError => err
         if index = string.index("\x00")
           string_before_null = string.slice(0, index)
           line = string_before_null.count("\n") + 1
           col = index - (string_before_null.rindex("\n") || 0)
           raise GraphQL::ParseError.new("Invalid null byte in query", line, col, string)
+        else
+          raise err
         end
-        raise
       rescue ParseError => e
-        error_message = e.message.match(/(\d+)\.(\d+): (.*)/)
-        if error_message
-          line = error_message[1].to_i
-          col = error_message[2].to_i
-          raise GraphQL::ParseError.new(error_message[3], line, col, string)
+        if string.strip.empty?
+          # Handle an empty string with a blank document
+          GraphQL::Language::Nodes::Document.new(definitions: [])
         else
-          raise GraphQL::ParseError.new(e.message, nil, nil, string)
+          error_message = e.message.match(/(\d+)\.(\d+): (.*)/)
+          if error_message
+            line = error_message[1].to_i
+            col = error_message[2].to_i
+            raise GraphQL::ParseError.new(error_message[3], line, col, string)
+          else
+            raise GraphQL::ParseError.new(e.message, nil, nil, string)
+          end
         end
       end
     end
diff --git a/test/graphql/libgraphqlparser_test.rb b/test/graphql/libgraphqlparser_test.rb
index 671d17b..5db2b79 100644
--- a/test/graphql/libgraphqlparser_test.rb
+++ b/test/graphql/libgraphqlparser_test.rb
@@ -1,248 +1,14 @@
 require 'test_helper'
 
 describe GraphQL::Libgraphqlparser do
-  let(:document) { GraphQL::Libgraphqlparser.parse(query_string) }
-  let(:query_string) {%|
-    query getStuff($someVar: Int = 1, $anotherVar: [String!] ) @skip(if: false) {
-      myField: someField(someArg: $someVar, ok: 1.4) @skip(if: $anotherVar) @thing(or: "Whatever")
-
-      anotherField(someArg: [1,2,3]) {
-        nestedField
-        ... moreNestedFields @skip(if: true)
-      }
-
-      ... on OtherType @include(unless: false){
-        field
-        anotherField
-      }
-
-    }
-
-    fragment moreNestedFields on NestedType @or(something: "ok") {
-      anotherNestedField
-    }
-  |}
-
-  describe '.parse' do
-    it 'parses queries' do
-      assert document
-    end
-
-    describe "visited nodes" do
-      let(:query) { document.definitions.first }
-      let(:fragment_def) { document.definitions.last }
-
-      it "creates a valid document" do
-        assert document.is_a?(GraphQL::Language::Nodes::Document)
-        assert_equal 2, document.definitions.length
-      end
-
-      it "creates a valid operation" do
-        assert query.is_a?(GraphQL::Language::Nodes::OperationDefinition)
-        assert_equal "getStuff", query.name
-        assert_equal "query", query.operation_type
-        assert_equal 2, query.variables.length
-        assert_equal 3, query.selections.length
-        assert_equal 1, query.directives.length
-        assert_equal [2, 5], [query.line, query.col]
-      end
-
-      it "creates a valid fragment definition" do
-        assert fragment_def.is_a?(GraphQL::Language::Nodes::FragmentDefinition)
-        assert_equal "moreNestedFields", fragment_def.name
-        assert_equal 1, fragment_def.selections.length
-        assert_equal "NestedType", fragment_def.type.name
-        assert_equal 1, fragment_def.directives.length
-        assert_equal [17, 5], fragment_def.position
-      end
-
-      describe "variable definitions" do
-        let(:optional_var) { query.variables.first }
-        it "gets name and type" do
-          assert_equal "someVar", optional_var.name
-          assert_equal "Int", optional_var.type.name
-        end
-
-        it "gets default value" do
-          assert_equal 1, optional_var.default_value
-        end
-
-        it "gets position info" do
-          assert_equal [2, 20], optional_var.position
-        end
-      end
-
-      describe "fields" do
-        let(:leaf_field) { query.selections.first }
-        let(:parent_field) { query.selections[1] }
-
-        it "gets name, alias, arguments and directives" do
-          assert_equal "someField", leaf_field.name
-          assert_equal "myField", leaf_field.alias
-          assert_equal 2, leaf_field.directives.length
-          assert_equal 2, leaf_field.arguments.length
-        end
-
-        it "gets nested fields" do
-          assert_equal 2, parent_field.selections.length
-        end
-
-        it "gets location info" do
-          assert_equal [3 ,7], leaf_field.position
-        end
-      end
-
-      describe "arguments" do
-        let(:literal_argument) { query.selections.first.arguments.last }
-        let(:variable_argument) { query.selections.first.arguments.first }
-
-        it "gets name and literal value" do
-          assert_equal "ok", literal_argument.name
-          assert_equal 1.4, literal_argument.value
-        end
-
-        it "gets name and variable value" do
-          assert_equal "someArg", variable_argument.name
-          assert_equal "someVar", variable_argument.value.name
-        end
-
-        it "gets position info" do
-          assert_equal [3, 26], variable_argument.position
-        end
-      end
-
-      describe "fragment spreads" do
-        let(:fragment_spread) { query.selections[1].selections.last }
-        it "gets the name and directives" do
-          assert_equal "moreNestedFields", fragment_spread.name
-          assert_equal 1, fragment_spread.directives.length
-        end
-
-        it "gets position info" do
-          assert_equal [7, 9], fragment_spread.position
-        end
-      end
-
-      describe "directives" do
-        let(:variable_directive) { query.selections.first.directives.first }
-
-        it "gets the name and arguments" do
-          assert_equal "skip", variable_directive.name
-          assert_equal "if", variable_directive.arguments.first.name
-          assert_equal 1, variable_directive.arguments.length
-        end
-
-        it "gets position info" do
-          assert_equal [3, 54], variable_directive.position
-        end
-      end
-
-      describe "inline fragments" do
-        let(:inline_fragment) { query.selections[2] }
-        it "gets the type and directives" do
-          assert_equal "OtherType", inline_fragment.type.name
-          assert_equal 2, inline_fragment.selections.length
-          assert_equal 1, inline_fragment.directives.length
-        end
-
-        it "gets position info" do
-          assert_equal [10, 7], inline_fragment.position
-        end
-
-        describe "without type condition" do
-          let(:query_string) { 'query { ... @skip(if: false) { field } }' }
-          let(:inline_fragment) { query.selections[0] }
-          it "gets directives and nil type" do
-            assert_equal nil, inline_fragment.type
-            assert_equal 1, inline_fragment.directives.length
-          end
-        end
-      end
-
-      describe "inputs" do
-        let(:query_string) {%|
-          {
-            field(
-              int: 3,
-              float: 4.7e-24,
-              bool: false,
-              string: "☀︎🏆",
-              enum: ENUM_NAME,
-              array: [7, 8, 9]
-              object: {a: [1,2,3], b: {c: "4"}}
-            )
-          }
-        |}
-
-        let(:inputs) { document.definitions.first.selections.first.arguments }
-
-        it "parses ints" do
-          assert_equal 3, inputs[0].value
-        end
-
-        it "parses floats" do
-          assert_equal 0.47e-23, inputs[1].value
-        end
-
-        it "parses booleans" do
-          assert_equal false, inputs[2].value
-        end
-
-        it "parses UTF-8 strings" do
-          assert_equal "☀︎🏆", inputs[3].value
-        end
-
-        it "parses enums" do
-          assert_instance_of GraphQL::Language::Nodes::Enum, inputs[4].value
-          assert_equal "ENUM_NAME", inputs[4].value.name
-        end
-
-        it "parses arrays" do
-          assert_equal [7,8,9], inputs[5].value
-        end
-
-        it "parses objects" do
-          obj = inputs[6].value
-          assert_equal "a", obj.arguments[0].name
-          assert_equal [1,2,3], obj.arguments[0].value
-          assert_equal "b", obj.arguments[1].name
-          assert_equal "c", obj.arguments[1].value.arguments[0].name
-          assert_equal "4", obj.arguments[1].value.arguments[0].value
-        end
-      end
-    end
-
-    describe "unnamed queries" do
-      let(:query_string) {%|
-        { name, age, height }
-      |}
-      let(:operation) { document.definitions.first }
-
-      it "parses unnamed queries" do
-        assert_equal 1, document.definitions.length
-        assert_equal "query", operation.operation_type
-        assert_equal nil, operation.name
-        assert_equal 3, operation.selections.length
-      end
-    end
-
-    describe "introspection query" do
-      let(:query_string) { GraphQL::Introspection::INTROSPECTION_QUERY }
-      it "parses a big ol' query" do
-        assert(document)
-      end
-    end
+  def parse(str)
+    GraphQL::Libgraphqlparser.parse(str)
   end
 
   describe "errors" do
-    let(:query_string) {%| query doSomething { bogus { } |}
-    it "raises a parse error" do
-      err = assert_raises(GraphQL::ParseError) { document }
-    end
-
     it "raises a parse error in query with null byte" do
       err = assert_raises(GraphQL::ParseError) do
-        GraphQL::Libgraphqlparser.parse("mutation{\nsend(message: \"null\x00byte\")\n}")
+        parse("mutation{\nsend(message: \"null\x00byte\")\n}")
       end
       assert_equal "Invalid null byte in query", err.message
       assert_equal 2, err.line
@@ -251,7 +17,7 @@
 
     it "raises a parse error in query with null byte and no new line" do
       err = assert_raises(GraphQL::ParseError) do
-        GraphQL::Libgraphqlparser.parse("mutation{send(message: \"null\x00byte\")}")
+        parse("mutation{send(message: \"null\x00byte\")}")
       end
       assert_equal "Invalid null byte in query", err.message
       assert_equal 1, err.line
diff --git a/test/graphql/query_parser_test.rb b/test/graphql/query_parser_test.rb
new file mode 100644
index 0000000..b253612
--- /dev/null
+++ b/test/graphql/query_parser_test.rb
@@ -0,0 +1,5 @@
+require "test_helper"
+
+LibgraphqlparserSuite = GraphQL::Compatibility::QueryParserSpecification.build_suite { |query_string|
+  GraphQL::Libgraphqlparser.parse(query_string)
+}