diff --git a/.gitignore b/.gitignore
index 080f19aa..b22842cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ phpunit.phar
 phpunit.phar.asc
 composer.phar
 composer.lock
+.phpunit.result.cache
diff --git a/tests/JWKTest.php b/tests/JWKTest.php
index fb94a34b..b908ea64 100644
--- a/tests/JWKTest.php
+++ b/tests/JWKTest.php
@@ -40,7 +40,7 @@ public function testParsePrivateKey()
         );
 
         $jwkSet = json_decode(
-            file_get_contents(__DIR__ . '/rsa-jwkset.json'),
+            file_get_contents(__DIR__ . '/data/rsa-jwkset.json'),
             true
         );
         $jwkSet['keys'][0]['d'] = 'privatekeyvalue';
@@ -56,7 +56,7 @@ public function testParsePrivateKeyWithoutAlg()
         );
 
         $jwkSet = json_decode(
-            file_get_contents(__DIR__ . '/rsa-jwkset.json'),
+            file_get_contents(__DIR__ . '/data/rsa-jwkset.json'),
             true
         );
         unset($jwkSet['keys'][0]['alg']);
@@ -67,7 +67,7 @@ public function testParsePrivateKeyWithoutAlg()
     public function testParseKeyWithEmptyDValue()
     {
         $jwkSet = json_decode(
-            file_get_contents(__DIR__ . '/rsa-jwkset.json'),
+            file_get_contents(__DIR__ . '/data/rsa-jwkset.json'),
             true
         );
 
@@ -81,7 +81,7 @@ public function testParseKeyWithEmptyDValue()
     public function testParseJwkKeySet()
     {
         $jwkSet = json_decode(
-            file_get_contents(__DIR__ . '/rsa-jwkset.json'),
+            file_get_contents(__DIR__ . '/data/rsa-jwkset.json'),
             true
         );
         $keys = JWK::parseKeySet($jwkSet);
@@ -109,7 +109,7 @@ public function testParseJwkKeySet_empty()
      */
     public function testDecodeByJwkKeySetTokenExpired()
     {
-        $privKey1 = file_get_contents(__DIR__ . '/rsa1-private.pem');
+        $privKey1 = file_get_contents(__DIR__ . '/data/rsa1-private.pem');
         $payload = array('exp' => strtotime('-1 hour'));
         $msg = JWT::encode($payload, $privKey1, 'RS256', 'jwk1');
 
@@ -123,7 +123,7 @@ public function testDecodeByJwkKeySetTokenExpired()
      */
     public function testDecodeByJwkKeySet()
     {
-        $privKey1 = file_get_contents(__DIR__ . '/rsa1-private.pem');
+        $privKey1 = file_get_contents(__DIR__ . '/data/rsa1-private.pem');
         $payload = array('sub' => 'foo', 'exp' => strtotime('+10 seconds'));
         $msg = JWT::encode($payload, $privKey1, 'RS256', 'jwk1');
 
@@ -137,7 +137,7 @@ public function testDecodeByJwkKeySet()
      */
     public function testDecodeByMultiJwkKeySet()
     {
-        $privKey2 = file_get_contents(__DIR__ . '/rsa2-private.pem');
+        $privKey2 = file_get_contents(__DIR__ . '/data/rsa2-private.pem');
         $payload = array('sub' => 'bar', 'exp' => strtotime('+10 seconds'));
         $msg = JWT::encode($payload, $privKey2, 'RS256', 'jwk2');
 
diff --git a/tests/JWTTest.php b/tests/JWTTest.php
index 593ba7c6..128ba56e 100644
--- a/tests/JWTTest.php
+++ b/tests/JWTTest.php
@@ -312,7 +312,7 @@ public function testInvalidEdDsaEncodeDecode()
     public function testRSEncodeDecodeWithPassphrase()
     {
         $privateKey = openssl_pkey_get_private(
-            file_get_contents(__DIR__ . '/rsa-with-passphrase.pem'),
+            file_get_contents(__DIR__ . '/data/rsa-with-passphrase.pem'),
             'passphrase'
         );
 
@@ -343,18 +343,18 @@ public function testEncodeDecode($privateKeyFile, $publicKeyFile, $alg)
     public function provideEncodeDecode()
     {
         return array(
-            array(__DIR__ . '/ecdsa-private.pem', __DIR__ . '/ecdsa-public.pem', 'ES256'),
-            array(__DIR__ . '/ecdsa384-private.pem', __DIR__ . '/ecdsa384-public.pem', 'ES384'),
-            array(__DIR__ . '/rsa1-private.pem', __DIR__ . '/rsa1-public.pub', 'RS512'),
-            array(__DIR__ . '/ed25519-1.sec', __DIR__ . '/ed25519-1.pub', 'EdDSA'),
+            array(__DIR__ . '/data/ecdsa-private.pem', __DIR__ . '/data/ecdsa-public.pem', 'ES256'),
+            array(__DIR__ . '/data/ecdsa384-private.pem', __DIR__ . '/data/ecdsa384-public.pem', 'ES384'),
+            array(__DIR__ . '/data/rsa1-private.pem', __DIR__ . '/data/rsa1-public.pub', 'RS512'),
+            array(__DIR__ . '/data/ed25519-1.sec', __DIR__ . '/data/ed25519-1.pub', 'EdDSA'),
         );
     }
 
     public function testEncodeDecodeWithResource()
     {
-        $pem = file_get_contents(__DIR__ . '/rsa1-public.pub');
+        $pem = file_get_contents(__DIR__ . '/data/rsa1-public.pub');
         $resource = openssl_pkey_get_public($pem);
-        $privateKey = file_get_contents(__DIR__ . '/rsa1-private.pem');
+        $privateKey = file_get_contents(__DIR__ . '/data/rsa1-private.pem');
 
         $payload = array('foo' => 'bar');
         $encoded = JWT::encode($payload, $privateKey, 'RS512');
diff --git a/tests/autoload.php.dist b/tests/autoload.php.dist
deleted file mode 100644
index 2e4310a0..00000000
--- a/tests/autoload.php.dist
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-// if the library is the project, try to use the composer's autoload for the tests
-$composerAutoload = __DIR__ . '/../vendor/autoload.php';
-
-if (is_file($composerAutoload)) {
-    include $composerAutoload;
-} else {
-    die('Unable to find autoload.php file, please use composer to load dependencies:
-
-wget http://getcomposer.org/composer.phar
-php composer.phar install
-
-Visit http://getcomposer.org/ for more information.
-
-');
-}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 326c2166..385b6706 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,7 +1,14 @@
 <?php
 
-if (file_exists($file = __DIR__ . '/autoload.php')) {
-    require_once $file;
-} elseif (file_exists($file = __DIR__ . '/autoload.php.dist')) {
+if (file_exists($file = __DIR__ . '/../vendor/autoload.php')) {
     require_once $file;
+} else {
+    die('Unable to find autoload.php file, please use composer to load dependencies:
+
+wget http://getcomposer.org/composer.phar
+php composer.phar install
+
+Visit http://getcomposer.org/ for more information.
+
+');
 }
diff --git a/tests/ecdsa-private.pem b/tests/data/ecdsa-private.pem
similarity index 100%
rename from tests/ecdsa-private.pem
rename to tests/data/ecdsa-private.pem
diff --git a/tests/ecdsa-public.pem b/tests/data/ecdsa-public.pem
similarity index 100%
rename from tests/ecdsa-public.pem
rename to tests/data/ecdsa-public.pem
diff --git a/tests/ecdsa384-private.pem b/tests/data/ecdsa384-private.pem
similarity index 100%
rename from tests/ecdsa384-private.pem
rename to tests/data/ecdsa384-private.pem
diff --git a/tests/ecdsa384-public.pem b/tests/data/ecdsa384-public.pem
similarity index 100%
rename from tests/ecdsa384-public.pem
rename to tests/data/ecdsa384-public.pem
diff --git a/tests/ed25519-1.pub b/tests/data/ed25519-1.pub
similarity index 100%
rename from tests/ed25519-1.pub
rename to tests/data/ed25519-1.pub
diff --git a/tests/ed25519-1.sec b/tests/data/ed25519-1.sec
similarity index 100%
rename from tests/ed25519-1.sec
rename to tests/data/ed25519-1.sec
diff --git a/tests/rsa-jwkset.json b/tests/data/rsa-jwkset.json
similarity index 100%
rename from tests/rsa-jwkset.json
rename to tests/data/rsa-jwkset.json
diff --git a/tests/rsa-with-passphrase.pem b/tests/data/rsa-with-passphrase.pem
similarity index 100%
rename from tests/rsa-with-passphrase.pem
rename to tests/data/rsa-with-passphrase.pem
diff --git a/tests/rsa1-private.pem b/tests/data/rsa1-private.pem
similarity index 100%
rename from tests/rsa1-private.pem
rename to tests/data/rsa1-private.pem
diff --git a/tests/rsa1-public.pub b/tests/data/rsa1-public.pub
similarity index 100%
rename from tests/rsa1-public.pub
rename to tests/data/rsa1-public.pub
diff --git a/tests/rsa2-private.pem b/tests/data/rsa2-private.pem
similarity index 100%
rename from tests/rsa2-private.pem
rename to tests/data/rsa2-private.pem