diff --git a/composer.json b/composer.json
index ce92ac1..dabf1cd 100644
--- a/composer.json
+++ b/composer.json
@@ -23,10 +23,8 @@
     }
   },
   "autoload-dev": {
-    "classmap": [
-      "tests/"
-    ],
-    "files": [
-    ]
+    "psr-4": {
+      "GraphQL\\Tests\\": "tests/"
+    }
   }
 }
diff --git a/tests/Executor/AbstractTest.php b/tests/Executor/AbstractTest.php
index 378810f..3540256 100644
--- a/tests/Executor/AbstractTest.php
+++ b/tests/Executor/AbstractTest.php
@@ -1,8 +1,8 @@
 <?php
-namespace GraphQL\Executor;
-
-require_once __DIR__ . '/TestClasses.php';
+namespace GraphQL\Tests\Executor;
 
+use GraphQL\Executor\ExecutionResult;
+use GraphQL\Executor\Executor;
 use GraphQL\Language\Parser;
 use GraphQL\Schema;
 use GraphQL\Type\Definition\InterfaceType;
diff --git a/tests/Executor/DirectivesTest.php b/tests/Executor/DirectivesTest.php
index 78bc564..67a48fb 100644
--- a/tests/Executor/DirectivesTest.php
+++ b/tests/Executor/DirectivesTest.php
@@ -1,6 +1,7 @@
 <?php
-namespace GraphQL\Executor;
+namespace GraphQL\Tests\Executor;
 
+use GraphQL\Executor\Executor;
 use GraphQL\Language\Parser;
 use GraphQL\Schema;
 use GraphQL\Type\Definition\ObjectType;
diff --git a/tests/Executor/ExecutorSchemaTest.php b/tests/Executor/ExecutorSchemaTest.php
index 8b23ae5..9c42692 100644
--- a/tests/Executor/ExecutorSchemaTest.php
+++ b/tests/Executor/ExecutorSchemaTest.php
@@ -1,6 +1,7 @@
 <?php
-namespace GraphQL\Executor;
+namespace GraphQL\Tests\Executor;
 
+use GraphQL\Executor\Executor;
 use GraphQL\Language\Parser;
 use GraphQL\Schema;
 use GraphQL\Type\Definition\Config;
diff --git a/tests/Executor/ExecutorTest.php b/tests/Executor/ExecutorTest.php
index 0ca0b35..8fdfda1 100644
--- a/tests/Executor/ExecutorTest.php
+++ b/tests/Executor/ExecutorTest.php
@@ -1,7 +1,8 @@
 <?php
-namespace GraphQL\Executor;
+namespace GraphQL\Tests\Executor;
 
 use GraphQL\Error;
+use GraphQL\Executor\Executor;
 use GraphQL\FormattedError;
 use GraphQL\Language\Parser;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Executor/ListsTest.php b/tests/Executor/ListsTest.php
index 25a9bd1..d618244 100644
--- a/tests/Executor/ListsTest.php
+++ b/tests/Executor/ListsTest.php
@@ -1,7 +1,8 @@
 <?php
-namespace GraphQL\Executor;
+namespace GraphQL\Tests\Executor;
 
 use GraphQL\Error;
+use GraphQL\Executor\Executor;
 use GraphQL\FormattedError;
 use GraphQL\Language\Parser;
 use GraphQL\Language\SourceLocation;
@@ -383,4 +384,4 @@ class ListsTest extends \PHPUnit_Framework_TestCase
             }
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Executor/MutationsTest.php b/tests/Executor/MutationsTest.php
index 768d4a3..f9e6fb7 100644
--- a/tests/Executor/MutationsTest.php
+++ b/tests/Executor/MutationsTest.php
@@ -1,6 +1,7 @@
 <?php
-namespace GraphQL\Executor;
+namespace GraphQL\Tests\Executor;
 
+use GraphQL\Executor\Executor;
 use GraphQL\FormattedError;
 use GraphQL\Language\Parser;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Executor/NonNullTest.php b/tests/Executor/NonNullTest.php
index 4cd9fe6..4b43982 100644
--- a/tests/Executor/NonNullTest.php
+++ b/tests/Executor/NonNullTest.php
@@ -1,7 +1,8 @@
 <?php
-namespace GraphQL\Executor;
+namespace GraphQL\Tests\Executor;
 
 use GraphQL\Error;
+use GraphQL\Executor\Executor;
 use GraphQL\FormattedError;
 use GraphQL\Language\Parser;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Executor/TestClasses.php b/tests/Executor/TestClasses.php
index c1fe6ba..7015b21 100644
--- a/tests/Executor/TestClasses.php
+++ b/tests/Executor/TestClasses.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Executor;
+namespace GraphQL\Tests\Executor;
 
 use GraphQL\Type\Definition\ScalarType;
 
diff --git a/tests/Executor/UnionInterfaceTest.php b/tests/Executor/UnionInterfaceTest.php
index 6a7f03b..2983968 100644
--- a/tests/Executor/UnionInterfaceTest.php
+++ b/tests/Executor/UnionInterfaceTest.php
@@ -1,8 +1,9 @@
 <?php
-namespace GraphQL\Executor;
+namespace GraphQL\Tests\Executor;
 
 require_once __DIR__ . '/TestClasses.php';
 
+use GraphQL\Executor\Executor;
 use GraphQL\Language\Parser;
 use GraphQL\Schema;
 use GraphQL\Type\Definition\Config;
diff --git a/tests/Executor/VariablesTest.php b/tests/Executor/VariablesTest.php
index 6cde735..209ae33 100644
--- a/tests/Executor/VariablesTest.php
+++ b/tests/Executor/VariablesTest.php
@@ -1,9 +1,10 @@
 <?php
-namespace GraphQL\Executor;
+namespace GraphQL\Tests\Executor;
 
 require_once __DIR__ . '/TestClasses.php';
 
 use GraphQL\Error;
+use GraphQL\Executor\Executor;
 use GraphQL\FormattedError;
 use GraphQL\Language\Parser;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Language/LexerTest.php b/tests/Language/LexerTest.php
index 5d0d30f..1d3f472 100644
--- a/tests/Language/LexerTest.php
+++ b/tests/Language/LexerTest.php
@@ -1,6 +1,9 @@
 <?php
-namespace GraphQL\Language;
+namespace GraphQL\Tests\Language;
 
+use GraphQL\Language\Lexer;
+use GraphQL\Language\Source;
+use GraphQL\Language\Token;
 use GraphQL\SyntaxError;
 
 class LexerTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/Language/ParserTest.php b/tests/Language/ParserTest.php
index 5a62b43..d1f9802 100644
--- a/tests/Language/ParserTest.php
+++ b/tests/Language/ParserTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Language;
+namespace GraphQL\Tests\Language;
 
 use GraphQL\Error;
 use GraphQL\Language\AST\Argument;
@@ -10,6 +10,9 @@ use GraphQL\Language\AST\Location;
 use GraphQL\Language\AST\Name;
 use GraphQL\Language\AST\OperationDefinition;
 use GraphQL\Language\AST\SelectionSet;
+use GraphQL\Language\Parser;
+use GraphQL\Language\Source;
+use GraphQL\Language\SourceLocation;
 use GraphQL\SyntaxError;
 
 class ParserTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/Language/PrinterTest.php b/tests/Language/PrinterTest.php
index 473a9aa..2a24bb0 100644
--- a/tests/Language/PrinterTest.php
+++ b/tests/Language/PrinterTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Language;
+namespace GraphQL\Tests\Language;
 
 use GraphQL\Language\AST\Document;
 use GraphQL\Language\AST\EnumValue;
@@ -10,6 +10,8 @@ use GraphQL\Language\AST\SelectionSet;
 use GraphQL\Language\AST\StringValue;
 use GraphQL\Language\AST\Variable;
 use GraphQL\Language\AST\VariableDefinition;
+use GraphQL\Language\Parser;
+use GraphQL\Language\Printer;
 
 class PrinterTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Language/VisitorTest.php b/tests/Language/VisitorTest.php
index 84e9b81..95c348c 100644
--- a/tests/Language/VisitorTest.php
+++ b/tests/Language/VisitorTest.php
@@ -1,10 +1,12 @@
 <?php
-namespace GraphQL\Language;
+namespace GraphQL\Tests\Language;
 
 use GraphQL\Language\AST\Field;
 use GraphQL\Language\AST\Name;
 use GraphQL\Language\AST\Node;
 use GraphQL\Language\AST\SelectionSet;
+use GraphQL\Language\Parser;
+use GraphQL\Language\Visitor;
 
 class VisitorTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/StarWarsData.php b/tests/StarWarsData.php
index ac1b773..05b7de4 100644
--- a/tests/StarWarsData.php
+++ b/tests/StarWarsData.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL;
+namespace GraphQL\Tests;
 
 class StarWarsData
 {
diff --git a/tests/StarWarsIntrospectionTest.php b/tests/StarWarsIntrospectionTest.php
index 68f034f..bdd7f03 100644
--- a/tests/StarWarsIntrospectionTest.php
+++ b/tests/StarWarsIntrospectionTest.php
@@ -1,7 +1,9 @@
 <?php
-namespace GraphQL;
+namespace GraphQL\Tests;
 
 
+use GraphQL\GraphQL;
+
 class StarWarsIntrospectionTest extends \PHPUnit_Framework_TestCase
 {
     // Star Wars Introspection Tests
diff --git a/tests/StarWarsQueryTest.php b/tests/StarWarsQueryTest.php
index dd28c0e..f8eb5e1 100644
--- a/tests/StarWarsQueryTest.php
+++ b/tests/StarWarsQueryTest.php
@@ -1,7 +1,9 @@
 <?php
-namespace GraphQL;
+namespace GraphQL\Tests;
 
 
+use GraphQL\GraphQL;
+
 class StarWarsQueryTest extends \PHPUnit_Framework_TestCase
 {
     // Star Wars Query Tests
diff --git a/tests/StarWarsSchema.php b/tests/StarWarsSchema.php
index 07f400f..351bb58 100644
--- a/tests/StarWarsSchema.php
+++ b/tests/StarWarsSchema.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL;
+namespace GraphQL\Tests;
 
 /**
  * This is designed to be an end-to-end test, demonstrating
@@ -11,6 +11,7 @@ namespace GraphQL;
  * NOTE: This may contain spoilers for the original Star
  * Wars trilogy.
  */
+use GraphQL\Schema;
 use GraphQL\Type\Definition\EnumType;
 use GraphQL\Type\Definition\InterfaceType;
 use GraphQL\Type\Definition\NonNull;
diff --git a/tests/StarWarsValidationTest.php b/tests/StarWarsValidationTest.php
index 357bb1c..8a68168 100644
--- a/tests/StarWarsValidationTest.php
+++ b/tests/StarWarsValidationTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL;
+namespace GraphQL\Tests;
 
 use GraphQL\Language\Parser;
 use GraphQL\Validator\DocumentValidator;
diff --git a/tests/Type/DefinitionTest.php b/tests/Type/DefinitionTest.php
index 5de5961..1dd9b8a 100644
--- a/tests/Type/DefinitionTest.php
+++ b/tests/Type/DefinitionTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Type;
+namespace GraphQL\Tests\Type;
 
 use GraphQL\Schema;
 use GraphQL\Type\Definition\Config;
diff --git a/tests/Type/IntrospectionTest.php b/tests/Type/IntrospectionTest.php
index 02eabef..76e03ea 100644
--- a/tests/Type/IntrospectionTest.php
+++ b/tests/Type/IntrospectionTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Type;
+namespace GraphQL\Tests\Type;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
@@ -9,6 +9,7 @@ use GraphQL\Type\Definition\EnumType;
 use GraphQL\Type\Definition\InputObjectType;
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\Type;
+use GraphQL\Type\Introspection;
 use GraphQL\Validator\Rules\ProvidedNonNullArguments;
 
 class IntrospectionTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/Type/ResolveInfoTest.php b/tests/Type/ResolveInfoTest.php
index 891e810..fe92137 100644
--- a/tests/Type/ResolveInfoTest.php
+++ b/tests/Type/ResolveInfoTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Type;
+namespace GraphQL\Tests\Type;
 
 use GraphQL\GraphQL;
 use GraphQL\Schema;
@@ -153,4 +153,4 @@ class ResolveInfoTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals($expectedDefaultSelection, $actualDefaultSelection);
         $this->assertEquals($expectedDeepSelection, $actualDeepSelection);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Type/ScalarSerializationTest.php b/tests/Type/ScalarSerializationTest.php
index 80ef84b..83af55d 100644
--- a/tests/Type/ScalarSerializationTest.php
+++ b/tests/Type/ScalarSerializationTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Type;
+namespace GraphQL\Tests\Type;
 
 use GraphQL\Type\Definition\Type;
 
@@ -60,4 +60,4 @@ class ScalarSerializationTest extends \PHPUnit_Framework_TestCase
 
         // TODO: how should it behaive on '0'?
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Type/SchemaValidatorTest.php b/tests/Type/SchemaValidatorTest.php
index 402f964..87408e5 100644
--- a/tests/Type/SchemaValidatorTest.php
+++ b/tests/Type/SchemaValidatorTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Type;
+namespace GraphQL\Tests\Type;
 
 use GraphQL\Schema;
 use GraphQL\Type\Definition\InputObjectType;
@@ -9,6 +9,8 @@ use GraphQL\Type\Definition\NonNull;
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\Type;
 use GraphQL\Type\Definition\UnionType;
+use GraphQL\Type\Introspection;
+use GraphQL\Type\SchemaValidator;
 
 class SchemaValidatorTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Validator/ArgumentsOfCorrectTypeTest.php b/tests/Validator/ArgumentsOfCorrectTypeTest.php
index 74e5181..577be7c 100644
--- a/tests/Validator/ArgumentsOfCorrectTypeTest.php
+++ b/tests/Validator/ArgumentsOfCorrectTypeTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/DefaultValuesOfCorrectTypeTest.php b/tests/Validator/DefaultValuesOfCorrectTypeTest.php
index 06a22d6..f48de76 100644
--- a/tests/Validator/DefaultValuesOfCorrectTypeTest.php
+++ b/tests/Validator/DefaultValuesOfCorrectTypeTest.php
@@ -1,8 +1,9 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
+use GraphQL\Validator\Messages;
 use GraphQL\Validator\Rules\DefaultValuesOfCorrectType;
 
 class DefaultValuesOfCorrectTypeTest extends TestCase
diff --git a/tests/Validator/FieldsOnCorrectTypeTest.php b/tests/Validator/FieldsOnCorrectTypeTest.php
index bb1c61e..ac5543a 100644
--- a/tests/Validator/FieldsOnCorrectTypeTest.php
+++ b/tests/Validator/FieldsOnCorrectTypeTest.php
@@ -1,8 +1,9 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
+use GraphQL\Validator\Messages;
 use GraphQL\Validator\Rules\FieldsOnCorrectType;
 
 class FieldsOnCorrectTypeTest extends TestCase
diff --git a/tests/Validator/FragmentsOnCompositeTypesTest.php b/tests/Validator/FragmentsOnCompositeTypesTest.php
index 1f1a261..4148bac 100644
--- a/tests/Validator/FragmentsOnCompositeTypesTest.php
+++ b/tests/Validator/FragmentsOnCompositeTypesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/KnownArgumentNamesTest.php b/tests/Validator/KnownArgumentNamesTest.php
index fafd944..dba1e2f 100644
--- a/tests/Validator/KnownArgumentNamesTest.php
+++ b/tests/Validator/KnownArgumentNamesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/KnownDirectivesTest.php b/tests/Validator/KnownDirectivesTest.php
index 6f2d4a3..50ec3e4 100644
--- a/tests/Validator/KnownDirectivesTest.php
+++ b/tests/Validator/KnownDirectivesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/KnownFragmentNamesTest.php b/tests/Validator/KnownFragmentNamesTest.php
index f79857e..1a39ff1 100644
--- a/tests/Validator/KnownFragmentNamesTest.php
+++ b/tests/Validator/KnownFragmentNamesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\Validator\Rules\KnownFragmentNames;
 use GraphQL\FormattedError;
diff --git a/tests/Validator/KnownTypeNamesTest.php b/tests/Validator/KnownTypeNamesTest.php
index 635616e..b9994ef 100644
--- a/tests/Validator/KnownTypeNamesTest.php
+++ b/tests/Validator/KnownTypeNamesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/NoFragmentCyclesTest.php b/tests/Validator/NoFragmentCyclesTest.php
index 8dd1d3a..8704bb3 100644
--- a/tests/Validator/NoFragmentCyclesTest.php
+++ b/tests/Validator/NoFragmentCyclesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/NoUndefinedVariablesTest.php b/tests/Validator/NoUndefinedVariablesTest.php
index ee4b249..a91b70e 100644
--- a/tests/Validator/NoUndefinedVariablesTest.php
+++ b/tests/Validator/NoUndefinedVariablesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/NoUnusedFragmentsTest.php b/tests/Validator/NoUnusedFragmentsTest.php
index 7ba79a5..15b2152 100644
--- a/tests/Validator/NoUnusedFragmentsTest.php
+++ b/tests/Validator/NoUnusedFragmentsTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/NoUnusedVariablesTest.php b/tests/Validator/NoUnusedVariablesTest.php
index 00218ec..bd8f4e9 100644
--- a/tests/Validator/NoUnusedVariablesTest.php
+++ b/tests/Validator/NoUnusedVariablesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/OverlappingFieldsCanBeMergedTest.php b/tests/Validator/OverlappingFieldsCanBeMergedTest.php
index d326a79..1d779eb 100644
--- a/tests/Validator/OverlappingFieldsCanBeMergedTest.php
+++ b/tests/Validator/OverlappingFieldsCanBeMergedTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\Source;
diff --git a/tests/Validator/PossibleFragmentSpreadsTest.php b/tests/Validator/PossibleFragmentSpreadsTest.php
index 3e3b9c1..fe64115 100644
--- a/tests/Validator/PossibleFragmentSpreadsTest.php
+++ b/tests/Validator/PossibleFragmentSpreadsTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/ProvidedNonNullArgumentsTest.php b/tests/Validator/ProvidedNonNullArgumentsTest.php
index cba4a06..2069428 100644
--- a/tests/Validator/ProvidedNonNullArgumentsTest.php
+++ b/tests/Validator/ProvidedNonNullArgumentsTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/ScalarLeafsTest.php b/tests/Validator/ScalarLeafsTest.php
index 1fe67dd..0b175a2 100644
--- a/tests/Validator/ScalarLeafsTest.php
+++ b/tests/Validator/ScalarLeafsTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
diff --git a/tests/Validator/TestCase.php b/tests/Validator/TestCase.php
index 41a8b1b..c2a6ed9 100644
--- a/tests/Validator/TestCase.php
+++ b/tests/Validator/TestCase.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\Language\Parser;
 use GraphQL\Schema;
@@ -10,6 +10,7 @@ use GraphQL\Type\Definition\ListOfType;
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\Type;
 use GraphQL\Type\Definition\UnionType;
+use GraphQL\Validator\DocumentValidator;
 
 abstract class TestCase extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/Validator/VariablesAreInputTypesTest.php b/tests/Validator/VariablesAreInputTypesTest.php
index 04b76cd..b1ce0f2 100644
--- a/tests/Validator/VariablesAreInputTypesTest.php
+++ b/tests/Validator/VariablesAreInputTypesTest.php
@@ -1,5 +1,5 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
@@ -39,4 +39,4 @@ class VariablesAreInputTypesTest extends TestCase
             ]
         );
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Validator/VariablesInAllowedPositionTest.php b/tests/Validator/VariablesInAllowedPositionTest.php
index c4accb4..3b43c0c 100644
--- a/tests/Validator/VariablesInAllowedPositionTest.php
+++ b/tests/Validator/VariablesInAllowedPositionTest.php
@@ -1,8 +1,9 @@
 <?php
-namespace GraphQL\Validator;
+namespace GraphQL\Tests\Validator;
 
 use GraphQL\FormattedError;
 use GraphQL\Language\SourceLocation;
+use GraphQL\Validator\Messages;
 use GraphQL\Validator\Rules\VariablesInAllowedPosition;
 
 class VariablesInAllowedPositionTest extends TestCase