diff --git a/tests/cases/AdditionalPropertiesTest.php b/tests/JsonSchema/Tests/AdditionalPropertiesTest.php
similarity index 99%
rename from tests/cases/AdditionalPropertiesTest.php
rename to tests/JsonSchema/Tests/AdditionalPropertiesTest.php
index 32397d7..88ff2e7 100644
--- a/tests/cases/AdditionalPropertiesTest.php
+++ b/tests/JsonSchema/Tests/AdditionalPropertiesTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace JsonSchema\Tests;
+
 class AdditionalPropertiesTest extends BaseTestCase
 {
     public function getInvalidTests()
@@ -68,7 +70,7 @@ class AdditionalPropertiesTest extends BaseTestCase
             )
         );
     }
-    
+
     public function getValidTests()
     {
         return array(
diff --git a/tests/cases/ArraysTest.php b/tests/JsonSchema/Tests/ArraysTest.php
similarity index 97%
rename from tests/cases/ArraysTest.php
rename to tests/JsonSchema/Tests/ArraysTest.php
index 0c0a14d..fd40b63 100644
--- a/tests/cases/ArraysTest.php
+++ b/tests/JsonSchema/Tests/ArraysTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace JsonSchema\Tests;
+
 class ArraysTest extends BaseTestCase
 {
     public function getInvalidTests()
@@ -35,7 +37,7 @@ class ArraysTest extends BaseTestCase
             )
         );
     }
-    
+
     public function getValidTests()
     {
         return array(
diff --git a/tests/BaseTestCase.php b/tests/JsonSchema/Tests/BaseTestCase.php
similarity index 90%
rename from tests/BaseTestCase.php
rename to tests/JsonSchema/Tests/BaseTestCase.php
index e7a771b..246c742 100644
--- a/tests/BaseTestCase.php
+++ b/tests/JsonSchema/Tests/BaseTestCase.php
@@ -1,6 +1,8 @@
 <?php
 
-abstract class BaseTestCase extends PHPUnit_Framework_TestCase
+namespace JsonSchema\Tests;
+
+abstract class BaseTestCase extends \PHPUnit_Framework_TestCase
 {
     /**
      * @dataProvider getInvalidTests
@@ -10,32 +12,32 @@ abstract class BaseTestCase extends PHPUnit_Framework_TestCase
         if (null === $checkMode) {
             $checkMode = JsonSchema::CHECK_MODE_NORMAL;
         }
-        
+
         JsonSchema::$checkMode = $checkMode;
-        
+
         $result = JsonSchema::validate(json_decode($input), json_decode($schema));
         if (array() !== $errors) {
             $this->assertEquals($errors, $result->errors, var_export($result, true));
         }
         $this->assertFalse($result->valid, var_export($result, true));
     }
-    
+
     /**
      * @dataProvider getValidTests
      */
     public function testValidCases($input, $schema, $checkMode = null)
-    {    
+    {
         if (null === $checkMode) {
             $checkMode = JsonSchema::CHECK_MODE_NORMAL;
         }
-        
+
         JsonSchema::$checkMode = $checkMode;
-        
+
         $result = JsonSchema::validate(json_decode($input), json_decode($schema));
         $this->assertTrue($result->valid, var_export($result, true));
     }
-    
+
     abstract public function getValidTests();
-    
+
     abstract public function getInvalidTests();
 }
\ No newline at end of file
diff --git a/tests/cases/BasicTypesTest.php b/tests/JsonSchema/Tests/BasicTypesTest.php
similarity index 95%
rename from tests/cases/BasicTypesTest.php
rename to tests/JsonSchema/Tests/BasicTypesTest.php
index 2902629..c226466 100644
--- a/tests/cases/BasicTypesTest.php
+++ b/tests/JsonSchema/Tests/BasicTypesTest.php
@@ -1,12 +1,14 @@
 <?php
 
+namespace JsonSchema\Tests;
+
 class BasicTypesTest extends BaseTestCase
 {
     public function getInvalidTests()
     {
         return array(
             array(
-                '{ 
+                '{
                   "string":null,
                   "number":null,
                   "integer":null,
@@ -15,7 +17,7 @@ class BasicTypesTest extends BaseTestCase
                   "array":null,
                   "null":1
                 }',
-                '{ 
+                '{
                   "type":"object",
                   "properties":{
                     "string":{"type":"string"},
@@ -31,12 +33,12 @@ class BasicTypesTest extends BaseTestCase
             )
         );
     }
-    
+
     public function getValidTests()
     {
         return array(
             array(
-                '{ 
+                '{
                   "string":"string test",
                   "number":1,
                   "integer":1,
@@ -52,7 +54,7 @@ class BasicTypesTest extends BaseTestCase
                   "any5": [],
                   "any6": null
                 }',
-                '{ 
+                '{
                   "type":"object",
                   "properties":{
                     "string":{"type":"string"},
diff --git a/tests/cases/DisallowTest.php b/tests/JsonSchema/Tests/DisallowTest.php
similarity index 98%
rename from tests/cases/DisallowTest.php
rename to tests/JsonSchema/Tests/DisallowTest.php
index cf8c6f9..a9ace32 100644
--- a/tests/cases/DisallowTest.php
+++ b/tests/JsonSchema/Tests/DisallowTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace JsonSchema\Tests;
+
 class DisallowTest extends BaseTestCase
 {
     public function getInvalidTests()
@@ -35,7 +37,7 @@ class DisallowTest extends BaseTestCase
             )
         );
     }
-    
+
     public function getValidTests()
     {
         return array(
diff --git a/tests/cases/EnumTest.php b/tests/JsonSchema/Tests/EnumTest.php
similarity index 96%
rename from tests/cases/EnumTest.php
rename to tests/JsonSchema/Tests/EnumTest.php
index f5eb5c6..2efe731 100644
--- a/tests/cases/EnumTest.php
+++ b/tests/JsonSchema/Tests/EnumTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace JsonSchema\Tests;
+
 class EnumTest extends BaseTestCase
 {
     public function getInvalidTests()
@@ -19,7 +21,7 @@ class EnumTest extends BaseTestCase
             )
         );
     }
-    
+
     public function getValidTests()
     {
         return array(
diff --git a/tests/cases/ExtendsTest.php b/tests/JsonSchema/Tests/ExtendsTest.php
similarity index 85%
rename from tests/cases/ExtendsTest.php
rename to tests/JsonSchema/Tests/ExtendsTest.php
index 58e0c51..35675ae 100644
--- a/tests/cases/ExtendsTest.php
+++ b/tests/JsonSchema/Tests/ExtendsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace JsonSchema\Tests;
+
 class ExtendsTest extends BaseTestCase
 {
     public function getInvalidTests()
@@ -15,18 +17,18 @@ class ExtendsTest extends BaseTestCase
                     "type": "object",
                     "properties": {
                         "name": {
-                            "type": "string" 
+                            "type": "string"
                         },
                         "age" : {
                             "type": "integer",
                              "maximum":120
-                        } 
+                        }
                     },
                     "extends": {
                         "id": "oldPerson",
                         "type": "object",
                         "properties": {
-                            "age" : {"minimum":70} 
+                            "age" : {"minimum":70}
                         }
                     }
                 }'
@@ -41,25 +43,25 @@ class ExtendsTest extends BaseTestCase
                     "type": "object",
                     "properties": {
                         "name": {
-                            "type": "string" 
+                            "type": "string"
                         },
                         "age" : {
                             "type": "integer",
                              "maximum":120
-                        } 
+                        }
                     },
                     "extends": {
                         "id": "oldPerson",
                         "type": "object",
                         "properties": {
-                            "age" : {"minimum":70} 
+                            "age" : {"minimum":70}
                         }
                     }
                 }'
             )
         );
     }
-    
+
     public function getValidTests()
     {
         return array(
@@ -73,18 +75,18 @@ class ExtendsTest extends BaseTestCase
                     "type": "object",
                     "properties": {
                         "name": {
-                            "type": "string" 
+                            "type": "string"
                         },
                         "age" : {
                             "type": "integer",
                              "maximum":120
-                        } 
+                        }
                     },
                     "extends": {
                         "id": "oldPerson",
                         "type": "object",
                         "properties": {
-                            "age" : {"minimum":70} 
+                            "age" : {"minimum":70}
                         }
                     }
                 }'
diff --git a/tests/cases/MaxDecimalTest.php b/tests/JsonSchema/Tests/MaxDecimalTest.php
similarity index 96%
rename from tests/cases/MaxDecimalTest.php
rename to tests/JsonSchema/Tests/MaxDecimalTest.php
index 067d497..d83d48a 100644
--- a/tests/cases/MaxDecimalTest.php
+++ b/tests/JsonSchema/Tests/MaxDecimalTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace JsonSchema\Tests;
+
 class MaxDecimalTest extends BaseTestCase
 {
     public function getInvalidTests()
@@ -18,7 +20,7 @@ class MaxDecimalTest extends BaseTestCase
             )
         );
     }
-    
+
     public function getValidTests()
     {
         return array(
diff --git a/tests/cases/MinItemsMaxItemsTest.php b/tests/JsonSchema/Tests/MinItemsMaxItemsTest.php
similarity index 95%
rename from tests/cases/MinItemsMaxItemsTest.php
rename to tests/JsonSchema/Tests/MinItemsMaxItemsTest.php
index b0800d1..22df680 100644
--- a/tests/cases/MinItemsMaxItemsTest.php
+++ b/tests/JsonSchema/Tests/MinItemsMaxItemsTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace JsonSchema\Tests;
+
 class MinItemsMaxItemsTest extends BaseTestCase
 {
     public function getInvalidTests()
@@ -29,7 +31,7 @@ class MinItemsMaxItemsTest extends BaseTestCase
             )
         );
     }
-    
+
     public function getValidTests()
     {
         return array(
@@ -46,7 +48,7 @@ class MinItemsMaxItemsTest extends BaseTestCase
             ),
             array(
                 '{
-                  "value":[2,2,5,8] 
+                  "value":[2,2,5,8]
                 }',
                 '{
                   "type":"object",
diff --git a/tests/cases/MinLengthMaxLengthTest.php b/tests/JsonSchema/Tests/MinLengthMaxLengthTest.php
similarity index 95%
rename from tests/cases/MinLengthMaxLengthTest.php
rename to tests/JsonSchema/Tests/MinLengthMaxLengthTest.php
index 6d0f4b9..4fb4614 100644
--- a/tests/cases/MinLengthMaxLengthTest.php
+++ b/tests/JsonSchema/Tests/MinLengthMaxLengthTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace JsonSchema\Tests;
+
 class MinLengthMaxLengthTest extends BaseTestCase
 {
     public function getInvalidTests()
@@ -7,7 +9,7 @@ class MinLengthMaxLengthTest extends BaseTestCase
         return array(
             array(
                 '{
-                  "value":"w" 
+                  "value":"w"
                 }',
                 '{
                   "type":"object",
@@ -29,7 +31,7 @@ class MinLengthMaxLengthTest extends BaseTestCase
             )
         );
     }
-    
+
     public function getValidTests()
     {
         return array(
@@ -55,7 +57,7 @@ class MinLengthMaxLengthTest extends BaseTestCase
                   }
                 }'
             ),
-            
+
         );
     }
 }
diff --git a/tests/cases/MinimumMaximumTest.php b/tests/JsonSchema/Tests/MinimumMaximumTest.php
similarity index 97%
rename from tests/cases/MinimumMaximumTest.php
rename to tests/JsonSchema/Tests/MinimumMaximumTest.php
index fb60b6b..283b29f 100644
--- a/tests/cases/MinimumMaximumTest.php
+++ b/tests/JsonSchema/Tests/MinimumMaximumTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace JsonSchema\Tests;
+
 class MinimumMaximumTest extends BaseTestCase
 {
     public function getInvalidTests()
@@ -29,7 +31,7 @@ class MinimumMaximumTest extends BaseTestCase
             )
         );
     }
-    
+
     public function getValidTests()
     {
         return array(
diff --git a/tests/cases/NumberAndIntegerTypesTest.php b/tests/JsonSchema/Tests/NumberAndIntegerTypesTest.php
similarity index 97%
rename from tests/cases/NumberAndIntegerTypesTest.php
rename to tests/JsonSchema/Tests/NumberAndIntegerTypesTest.php
index c64da6a..fb57ec1 100644
--- a/tests/cases/NumberAndIntegerTypesTest.php
+++ b/tests/JsonSchema/Tests/NumberAndIntegerTypesTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace JsonSchema\Tests;
+
 class NumberAndIntegerTypesTest extends BaseTestCase
 {
     public function getInvalidTests()
@@ -18,7 +20,7 @@ class NumberAndIntegerTypesTest extends BaseTestCase
             )
         );
     }
-    
+
     public function getValidTests()
     {
         return array(
diff --git a/tests/cases/OptionalPropertyTest.php b/tests/JsonSchema/Tests/OptionalPropertyTest.php
similarity index 96%
rename from tests/cases/OptionalPropertyTest.php
rename to tests/JsonSchema/Tests/OptionalPropertyTest.php
index 690848b..a80998c 100644
--- a/tests/cases/OptionalPropertyTest.php
+++ b/tests/JsonSchema/Tests/OptionalPropertyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace JsonSchema\Tests;
+
 class OptionalPropertyTest extends BaseTestCase
 {
     public function getInvalidTests()
@@ -16,7 +18,7 @@ class OptionalPropertyTest extends BaseTestCase
             )
         );
     }
-    
+
     public function getValidTests()
     {
         return array(
diff --git a/tests/cases/PatternTest.php b/tests/JsonSchema/Tests/PatternTest.php
similarity index 97%
rename from tests/cases/PatternTest.php
rename to tests/JsonSchema/Tests/PatternTest.php
index bee14d2..9c984cf 100644
--- a/tests/cases/PatternTest.php
+++ b/tests/JsonSchema/Tests/PatternTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace JsonSchema\Tests;
+
 class PatternTest extends BaseTestCase
 {
     public function getInvalidTests()
@@ -19,7 +21,7 @@ class PatternTest extends BaseTestCase
             )
         );
     }
-    
+
     public function getValidTests()
     {
         return array(
diff --git a/tests/cases/PhpTypeCastModeTest.php b/tests/JsonSchema/Tests/PhpTypeCastModeTest.php
similarity index 100%
rename from tests/cases/PhpTypeCastModeTest.php
rename to tests/JsonSchema/Tests/PhpTypeCastModeTest.php
diff --git a/tests/cases/RequireTest.php b/tests/JsonSchema/Tests/RequireTest.php
similarity index 97%
rename from tests/cases/RequireTest.php
rename to tests/JsonSchema/Tests/RequireTest.php
index f95856e..5668dcf 100644
--- a/tests/cases/RequireTest.php
+++ b/tests/JsonSchema/Tests/RequireTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace JsonSchema\Tests;
+
 class RequireTest extends BaseTestCase
 {
     public function getInvalidTests()
@@ -19,7 +21,7 @@ class RequireTest extends BaseTestCase
             )
         );
     }
-    
+
     public function getValidTests()
     {
         return array(
diff --git a/tests/cases/SelfDefinedSchemaTest.php b/tests/JsonSchema/Tests/SelfDefinedSchemaTest.php
similarity index 78%
rename from tests/cases/SelfDefinedSchemaTest.php
rename to tests/JsonSchema/Tests/SelfDefinedSchemaTest.php
index e38b871..ef5b3ae 100644
--- a/tests/cases/SelfDefinedSchemaTest.php
+++ b/tests/JsonSchema/Tests/SelfDefinedSchemaTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace JsonSchema\Tests;
+
 class SelfDefinedSchemaTest extends BaseTestCase
 {
     public function getInvalidTests()
@@ -10,14 +12,14 @@ class SelfDefinedSchemaTest extends BaseTestCase
                     "$schema": {
                         "properties": {
                             "name": {
-                                "type": "string" 
+                                "type": "string"
                             },
                             "age" : {
                                 "type": "integer",
                                 "maximum": 25,
-                                "optional": true 
-                            } 
-                        } 
+                                "optional": true
+                            }
+                        }
                     },
                     "name" : "John Doe",
                     "age" : 30,
@@ -27,7 +29,7 @@ class SelfDefinedSchemaTest extends BaseTestCase
             )
         );
     }
-    
+
     public function getValidTests()
     {
         return array(
@@ -36,14 +38,14 @@ class SelfDefinedSchemaTest extends BaseTestCase
                     "$schema": {
                         "properties": {
                             "name": {
-                                "type": "string" 
+                                "type": "string"
                             },
                             "age" : {
                                 "type": "integer",
                                 "maximum": 125,
-                                "optional": true 
-                            } 
-                        } 
+                                "optional": true
+                            }
+                        }
                     },
                     "name" : "John Doe",
                     "age" : 30,
diff --git a/tests/cases/TupleTypingTest.php b/tests/JsonSchema/Tests/TupleTypingTest.php
similarity index 96%
rename from tests/cases/TupleTypingTest.php
rename to tests/JsonSchema/Tests/TupleTypingTest.php
index c0565a6..00e4a12 100644
--- a/tests/cases/TupleTypingTest.php
+++ b/tests/JsonSchema/Tests/TupleTypingTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace JsonSchema\Tests;
+
 class TupleTypingTest extends BaseTestCase
 {
     public function getInvalidTests()
@@ -17,7 +19,7 @@ class TupleTypingTest extends BaseTestCase
                       "items":[
                         {"type":"string"},
                         {"type":"number"}
-                      ] 
+                      ]
                     }
                   }
                 }'
@@ -70,14 +72,14 @@ class TupleTypingTest extends BaseTestCase
                       "items":[
                         {"type":"string"},
                         {"type":"number"}
-                      ] 
+                      ]
                     }
                   }
                 }'
             )
         );
     }
-    
+
     public function getValidTests()
     {
         return array(
@@ -94,7 +96,7 @@ class TupleTypingTest extends BaseTestCase
                         {"type":"string"},
                         {"type":"number","optional":true},
                         {"type":"number","optional":true}
-                      ] 
+                      ]
                     }
                   }
                 }'
diff --git a/tests/cases/UnionTypesTest.php b/tests/JsonSchema/Tests/UnionTypesTest.php
similarity index 97%
rename from tests/cases/UnionTypesTest.php
rename to tests/JsonSchema/Tests/UnionTypesTest.php
index 0e3a516..2f9ba74 100644
--- a/tests/cases/UnionTypesTest.php
+++ b/tests/JsonSchema/Tests/UnionTypesTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace JsonSchema\Tests;
+
 class UnionTypesTest extends BaseTestCase
 {
     public function getInvalidTests()
@@ -20,7 +22,7 @@ class UnionTypesTest extends BaseTestCase
             )
         );
     }
-    
+
     public function getValidTests()
     {
         return array(
diff --git a/tests/cases/UnionWithNullValueTest.php b/tests/JsonSchema/Tests/UnionWithNullValueTest.php
similarity index 97%
rename from tests/cases/UnionWithNullValueTest.php
rename to tests/JsonSchema/Tests/UnionWithNullValueTest.php
index b535e50..8738856 100644
--- a/tests/cases/UnionWithNullValueTest.php
+++ b/tests/JsonSchema/Tests/UnionWithNullValueTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace JsonSchema\Tests;
+
 class UnionWithNullValueTest extends BaseTestCase
 {
     public function getInvalidTests()
@@ -20,7 +22,7 @@ class UnionWithNullValueTest extends BaseTestCase
             )
         );
     }
-    
+
     public function getValidTests()
     {
         return array(
diff --git a/tests/cases/WrongMessagesFailingTestCaseTest.php b/tests/JsonSchema/Tests/WrongMessagesFailingTestCaseTest.php
similarity index 97%
rename from tests/cases/WrongMessagesFailingTestCaseTest.php
rename to tests/JsonSchema/Tests/WrongMessagesFailingTestCaseTest.php
index d8d6364..5f9ce33 100644
--- a/tests/cases/WrongMessagesFailingTestCaseTest.php
+++ b/tests/JsonSchema/Tests/WrongMessagesFailingTestCaseTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace JsonSchema\Tests;
+
 class WrongMessagesFailingTestCaseTest extends BaseTestCase
 {
     public function getInvalidTests()
@@ -20,7 +22,7 @@ class WrongMessagesFailingTestCaseTest extends BaseTestCase
             )
         );
     }
-    
+
     public function getValidTests()
     {
         return array(
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 6e9d185..30be8cb 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,4 +1,8 @@
 <?php
 
-require dirname(__FILE__) . '/../bootstrap.php';
-require 'BaseTestCase.php';
\ No newline at end of file
+require_once __DIR__.'/../vendor/symfony/Component/ClassLoader/UniversalClassLoader.php';
+
+$loader = new Symfony\Component\ClassLoader\UniversalClassLoader();
+$loader->registerNamespace('JsonSchema', __DIR__.'/../src');
+$loader->registerNamespace('JsonSchema\Tests', __DIR__);
+$loader->register();