diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8051d568e..eee9ec7b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+2.0.1
+-----
+
+* Fixed cache key sanitize for PSR-16 cache.
+* Fixed not found detection for PSR-16 cache.
+
 2.0.0
 -----
 
@@ -24,6 +30,12 @@ Changelog
 1.x
 ===
 
+1.13.0
+------
+
+* Fixed cache key sanitize for PSR-16 cache.
+* Fixed not found detection for PSR-16 cache.
+
 1.12.0
 ------
 
diff --git a/composer.json b/composer.json
index 6ed078087..a630e7f09 100644
--- a/composer.json
+++ b/composer.json
@@ -43,8 +43,10 @@
         "psr-0": { "Jackalope\\": "src/" }
     },
     "autoload-dev": {
+        "psr-4": {
+            "Jackalope\\Tests\\": "tests/"
+        },
         "psr-0": {
-            "Jackalope\\Test\\": "tests/",
             "Jackalope\\": "vendor/jackalope/jackalope/tests",
             "PHPCR": "vendor/phpcr/phpcr/tests"
         }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index ffb7778fa..ab39368b3 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -27,8 +27,8 @@
 
     <testsuites>
         <testsuite name="Jackalope Doctrine DBAL Tests">
-            <directory>tests/Jackalope/Transport</directory>
-            <directory>tests/Jackalope/Tools</directory>
+            <directory>tests/Transport</directory>
+            <directory>tests/Tools</directory>
             <directory>vendor/jackalope/jackalope/tests</directory>
             <directory>vendor/phpcr/phpcr/tests</directory>
             <directory>vendor/phpcr/phpcr-utils/tests</directory>
diff --git a/src/Jackalope/Transport/DoctrineDBAL/CachedClient.php b/src/Jackalope/Transport/DoctrineDBAL/CachedClient.php
index f168554c1..5de420ee1 100644
--- a/src/Jackalope/Transport/DoctrineDBAL/CachedClient.php
+++ b/src/Jackalope/Transport/DoctrineDBAL/CachedClient.php
@@ -50,8 +50,12 @@ public function __construct(FactoryInterface $factory, Connection $conn, array $
             }
         }
         $this->caches = $caches;
-        $this->keySanitizer = static function (string $cacheKey): string {
-            return str_replace(' ', '_', $cacheKey);
+        $this->keySanitizer = static function ($cacheKey) {
+            return str_replace(
+                ['%', '.'],
+                ['_', '|'],
+                \urlencode($cacheKey)
+            );
         };
     }
 
@@ -219,7 +223,7 @@ public function getNode(string $path): \stdClass
         $cacheKey = "nodes: $path, ".$this->workspaceName;
         $cacheKey = $this->sanitizeKey($cacheKey);
 
-        if (false !== ($result = $this->caches['nodes']->get($cacheKey))) {
+        if (null !== ($result = $this->caches['nodes']->get($cacheKey))) {
             if ('ItemNotFoundException' === $result) {
                 throw new ItemNotFoundException("Item '$path' not found in workspace '$this->workspaceName'");
             }
@@ -354,7 +358,7 @@ public function getNodePathForIdentifier($uuid, $workspace = null): string
         $cacheKey = "nodes by uuid: $uuid, $this->workspaceName";
         $cacheKey = $this->sanitizeKey($cacheKey);
 
-        if (false !== ($result = $this->caches['nodes']->get($cacheKey))) {
+        if (null !== ($result = $this->caches['nodes']->get($cacheKey))) {
             if ('ItemNotFoundException' === $result) {
                 throw new ItemNotFoundException("no item found with uuid $uuid");
             }
@@ -407,7 +411,7 @@ public function getReferences($path, $name = null): array
         $cacheKey = "nodes references: $path, $name, ".$this->workspaceName;
         $cacheKey = $this->sanitizeKey($cacheKey);
 
-        if (false !== ($result = $this->caches['nodes']->get($cacheKey))) {
+        if (null !== ($result = $this->caches['nodes']->get($cacheKey))) {
             return $result;
         }
 
@@ -449,7 +453,7 @@ public function query(Query $query): array
         $cacheKey = "query: {$query->getStatement()}, {$query->getLimit()}, {$query->getOffset()}, {$query->getLanguage()}, ".$this->workspaceName;
         $cacheKey = $this->sanitizeKey($cacheKey);
 
-        if (false !== ($result = $this->caches['query']->get($cacheKey))) {
+        if (null !== ($result = $this->caches['query']->get($cacheKey))) {
             return $result;
         }
 
diff --git a/tests/Jackalope/Test/FunctionalTestCase.php b/tests/FunctionalTestCase.php
similarity index 91%
rename from tests/Jackalope/Test/FunctionalTestCase.php
rename to tests/FunctionalTestCase.php
index eff0aa1c3..d4fd796b5 100644
--- a/tests/Jackalope/Test/FunctionalTestCase.php
+++ b/tests/FunctionalTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Jackalope\Test;
+namespace Jackalope\Tests;
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Platforms\SqlitePlatform;
@@ -10,6 +10,7 @@
 use Jackalope\Transport\DoctrineDBAL\Client;
 use Jackalope\Transport\DoctrineDBAL\RepositorySchema;
 use Jackalope\Transport\TransportInterface;
+use Jackalope\Transport\WorkspaceManagementInterface;
 use PHPCR\RepositoryException;
 use PHPCR\SimpleCredentials;
 
@@ -29,6 +30,7 @@ public function setUp(): void
         $conn = $this->getConnection();
         $this->loadFixtures($conn);
         $this->transport = $this->getClient($conn);
+        $this->assertInstanceOf(WorkspaceManagementInterface::class, $this->transport);
 
         $this->transport->createWorkspace('default');
         $this->repository = new Repository(null, $this->transport);
diff --git a/tests/ImplementationLoader.php b/tests/ImplementationLoader.php
index bc66cc8dd..06a72cba0 100644
--- a/tests/ImplementationLoader.php
+++ b/tests/ImplementationLoader.php
@@ -8,9 +8,9 @@
 use Jackalope\Repository;
 use Jackalope\RepositoryFactoryDoctrineDBAL;
 use Jackalope\Session;
-use Jackalope\Test\Tester\Generic;
-use Jackalope\Test\Tester\Mysql;
-use Jackalope\Test\Tester\Pgsql;
+use Jackalope\Tests\Test\Tester\Generic;
+use Jackalope\Tests\Test\Tester\Mysql;
+use Jackalope\Tests\Test\Tester\Pgsql;
 use Jackalope\Transport\DoctrineDBAL\Client;
 use Jackalope\Transport\Logging\Psr3Logger;
 use PHPCR\RepositoryException;
@@ -141,8 +141,8 @@ public function getRepositoryFactoryParameters()
 
     public function getSessionWithLastModified()
     {
-        /** @var $session Session */
         $session = $this->getSession();
+        \assert($session instanceof Session);
         $session->setSessionOption(Session::OPTION_AUTO_LASTMODIFIED, true);
 
         return $session;
diff --git a/tests/Jackalope/RepositoryFactoryDoctrineDBALTest.php b/tests/RepositoryFactoryDoctrineDBALTest.php
similarity index 92%
rename from tests/Jackalope/RepositoryFactoryDoctrineDBALTest.php
rename to tests/RepositoryFactoryDoctrineDBALTest.php
index 36c067185..b840876f5 100644
--- a/tests/Jackalope/RepositoryFactoryDoctrineDBALTest.php
+++ b/tests/RepositoryFactoryDoctrineDBALTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Jackalope;
+namespace Jackalope\Tests;
 
 use Doctrine\DBAL\Connection;
+use Jackalope\RepositoryFactoryDoctrineDBAL;
 use PHPCR\ConfigurationException;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Jackalope/Test/Fixture/DBUnitFixtureXML.php b/tests/Test/Fixture/DBUnitFixtureXML.php
similarity index 99%
rename from tests/Jackalope/Test/Fixture/DBUnitFixtureXML.php
rename to tests/Test/Fixture/DBUnitFixtureXML.php
index 9dfb399c9..4c0b8cf16 100644
--- a/tests/Jackalope/Test/Fixture/DBUnitFixtureXML.php
+++ b/tests/Test/Fixture/DBUnitFixtureXML.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Jackalope\Test\Fixture;
+namespace Jackalope\Tests\Test\Fixture;
 
 use PHPCR\Util\PathHelper;
 use PHPCR\Util\UUIDHelper;
diff --git a/tests/Jackalope/Test/Fixture/JCRSystemXML.php b/tests/Test/Fixture/JCRSystemXML.php
similarity index 95%
rename from tests/Jackalope/Test/Fixture/JCRSystemXML.php
rename to tests/Test/Fixture/JCRSystemXML.php
index f66de0e07..d2ba86e1d 100644
--- a/tests/Jackalope/Test/Fixture/JCRSystemXML.php
+++ b/tests/Test/Fixture/JCRSystemXML.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Jackalope\Test\Fixture;
+namespace Jackalope\Tests\Test\Fixture;
 
 /**
  * Jackalope Document or System Views.
diff --git a/tests/Jackalope/Test/Fixture/XMLDocument.php b/tests/Test/Fixture/XMLDocument.php
similarity index 98%
rename from tests/Jackalope/Test/Fixture/XMLDocument.php
rename to tests/Test/Fixture/XMLDocument.php
index 3d075c9d0..da34eb264 100644
--- a/tests/Jackalope/Test/Fixture/XMLDocument.php
+++ b/tests/Test/Fixture/XMLDocument.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Jackalope\Test\Fixture;
+namespace Jackalope\Tests\Test\Fixture;
 
 /**
  * Base for Jackalope Document or System Views and PHPUnit DBUnit Fixture XML classes.
diff --git a/tests/Jackalope/Test/Tester/Generic.php b/tests/Test/Tester/Generic.php
similarity index 98%
rename from tests/Jackalope/Test/Tester/Generic.php
rename to tests/Test/Tester/Generic.php
index cd06686f8..daf3d7373 100644
--- a/tests/Jackalope/Test/Tester/Generic.php
+++ b/tests/Test/Tester/Generic.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Jackalope\Test\Tester;
+namespace Jackalope\Tests\Test\Tester;
 
 use Doctrine\DBAL\Connection;
 use PHPCR\Test\FixtureLoaderInterface;
diff --git a/tests/Jackalope/Test/Tester/Mysql.php b/tests/Test/Tester/Mysql.php
similarity index 92%
rename from tests/Jackalope/Test/Tester/Mysql.php
rename to tests/Test/Tester/Mysql.php
index 25546b84e..946ea3237 100644
--- a/tests/Jackalope/Test/Tester/Mysql.php
+++ b/tests/Test/Tester/Mysql.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Jackalope\Test\Tester;
+namespace Jackalope\Tests\Test\Tester;
 
 /**
  * MySQL specific tester class.
diff --git a/tests/Jackalope/Test/Tester/Pgsql.php b/tests/Test/Tester/Pgsql.php
similarity index 95%
rename from tests/Jackalope/Test/Tester/Pgsql.php
rename to tests/Test/Tester/Pgsql.php
index 86945b68b..f4dd97e06 100644
--- a/tests/Jackalope/Test/Tester/Pgsql.php
+++ b/tests/Test/Tester/Pgsql.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Jackalope\Test\Tester;
+namespace Jackalope\Tests\Test\Tester;
 
 /**
  * PostgreSQL specific tester class.
diff --git a/tests/Jackalope/Test/Tester/XmlDataSet.php b/tests/Test/Tester/XmlDataSet.php
similarity index 99%
rename from tests/Jackalope/Test/Tester/XmlDataSet.php
rename to tests/Test/Tester/XmlDataSet.php
index 136ef4ae7..4347bb137 100644
--- a/tests/Jackalope/Test/Tester/XmlDataSet.php
+++ b/tests/Test/Tester/XmlDataSet.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Jackalope\Test\Tester;
+namespace Jackalope\Tests\Test\Tester;
 
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\Index;
diff --git a/tests/Jackalope/Test/TestCase.php b/tests/TestCase.php
similarity index 98%
rename from tests/Jackalope/Test/TestCase.php
rename to tests/TestCase.php
index 7e8d73393..115703d45 100644
--- a/tests/Jackalope/Test/TestCase.php
+++ b/tests/TestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Jackalope\Test;
+namespace Jackalope\Tests;
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DriverManager;
diff --git a/tests/Jackalope/Tools/Console/InitDoctrineDbalCommandTest.php b/tests/Tools/Console/InitDoctrineDbalCommandTest.php
similarity index 95%
rename from tests/Jackalope/Tools/Console/InitDoctrineDbalCommandTest.php
rename to tests/Tools/Console/InitDoctrineDbalCommandTest.php
index 93faf6783..bd1e9cff6 100644
--- a/tests/Jackalope/Tools/Console/InitDoctrineDbalCommandTest.php
+++ b/tests/Tools/Console/InitDoctrineDbalCommandTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Jackalope\Tools\Console;
+namespace Jackalope\Tests\Tools\Console;
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
@@ -9,6 +9,7 @@
 use Doctrine\DBAL\Schema\SchemaConfig;
 use Jackalope\Tools\Console\Command\InitDoctrineDbalCommand;
 use Jackalope\Tools\Console\Helper\DoctrineDbalHelper;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Helper\HelperSet;
@@ -22,7 +23,7 @@ class InitDoctrineDbalCommandTest extends TestCase
     protected $helperSet;
 
     /**
-     * @var Connection
+     * @var Connection&MockObject
      */
     protected $connection;
 
@@ -32,7 +33,7 @@ class InitDoctrineDbalCommandTest extends TestCase
     protected $platform;
 
     /**
-     * @var AbstractSchemaManager
+     * @var AbstractSchemaManager&MockObject
      */
     protected $schemaManager;
 
diff --git a/tests/Transport/DoctrineDBAL/CachedClientFunctionalTest.php b/tests/Transport/DoctrineDBAL/CachedClientFunctionalTest.php
new file mode 100644
index 000000000..30cdaaf32
--- /dev/null
+++ b/tests/Transport/DoctrineDBAL/CachedClientFunctionalTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Jackalope\Tests\Transport\DoctrineDBAL;
+
+use Doctrine\DBAL\Connection;
+use Jackalope\Factory;
+use Jackalope\Transport\DoctrineDBAL\CachedClient;
+use Jackalope\Transport\TransportInterface;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Cache\Psr16Cache;
+
+class CachedClientFunctionalTest extends ClientTest
+{
+    protected function getClient(Connection $conn): TransportInterface
+    {
+        $nodeCacheAdapter = new ArrayAdapter();
+        $nodeCache = new Psr16Cache($nodeCacheAdapter);
+
+        $metaCacheAdapter = new ArrayAdapter();
+        $metaCache = new Psr16Cache($metaCacheAdapter);
+
+        return new CachedClient(new Factory(), $conn, [
+            'nodes' => $nodeCache,
+            'meta' => $metaCache,
+        ]);
+    }
+}
diff --git a/tests/Jackalope/Transport/DoctrineDBAL/CachedClientTest.php b/tests/Transport/DoctrineDBAL/CachedClientTest.php
similarity index 65%
rename from tests/Jackalope/Transport/DoctrineDBAL/CachedClientTest.php
rename to tests/Transport/DoctrineDBAL/CachedClientTest.php
index 1a33c20d9..6860829b6 100644
--- a/tests/Jackalope/Transport/DoctrineDBAL/CachedClientTest.php
+++ b/tests/Transport/DoctrineDBAL/CachedClientTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Jackalope\Transport\DoctrineDBAL;
+namespace Jackalope\Tests\Transport\DoctrineDBAL;
 
 use Doctrine\DBAL\Connection;
 use Jackalope\Factory;
-use Jackalope\Test\FunctionalTestCase;
+use Jackalope\Tests\FunctionalTestCase;
+use Jackalope\Transport\DoctrineDBAL\CachedClient;
 use Jackalope\Transport\TransportInterface;
 use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
@@ -30,25 +31,28 @@ public function testArrayObjectIsConvertedToArray(): void
         self::assertIsArray($namespaces);
     }
 
-    public function testCacheHit()
+    public function testCacheHit(): void
     {
         $cache = new \stdClass();
         $cache->foo = 'bar';
-        $this->cache->set('nodes:_/test,_tests', $cache);
+        $this->cache->set('nodes_3A+_2Ftest_2C+tests', $cache);
         $this->assertEquals($cache, $this->transport->getNode('/test'));
     }
 
     /**
-     * The default key sanitizer replaces spaces with underscores.
+     * The default key sanitizer keeps the cache key compatible with PSR16.
      */
     public function testDefaultKeySanitizer(): void
     {
-        /** @var CachedClient $cachedClient */
-        $cachedClient = $this->transport;
-        $cachedClient->getNodeTypes();
+        $client = $this->getClient($this->getConnection());
+        $reflection = new \ReflectionClass($client);
+        $keySanitizerProperty = $reflection->getProperty('keySanitizer');
+        $keySanitizerProperty->setAccessible(true);
+        $defaultKeySanitizer = $keySanitizerProperty->getValue($client);
+
+        $result = $defaultKeySanitizer(' :{}().@/"\\'); // not allowed PSR16 keys
 
-        $this->assertTrue($this->cache->has('node_types'));
-        $this->assertTrue($this->cache->has('nodetypes:_a:0:{}'));
+        $this->assertEquals('+_3A_7B_7D_28_29|_40_2F_22_5C', $result);
     }
 
     public function testCustomKeySanitizer(): void
diff --git a/tests/Jackalope/Transport/DoctrineDBAL/ClientTest.php b/tests/Transport/DoctrineDBAL/ClientTest.php
similarity index 98%
rename from tests/Jackalope/Transport/DoctrineDBAL/ClientTest.php
rename to tests/Transport/DoctrineDBAL/ClientTest.php
index 998e6d014..798e84925 100644
--- a/tests/Jackalope/Transport/DoctrineDBAL/ClientTest.php
+++ b/tests/Transport/DoctrineDBAL/ClientTest.php
@@ -1,9 +1,11 @@
 <?php
 
-namespace Jackalope\Transport\DoctrineDBAL;
+namespace Jackalope\Tests\Transport\DoctrineDBAL;
 
 use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Jackalope\Test\FunctionalTestCase;
+use Jackalope\Tests\FunctionalTestCase;
+use Jackalope\Transport\DoctrineDBAL\Client;
+use Jackalope\Transport\WritingInterface;
 use PHPCR\PropertyType;
 use PHPCR\Query\QOM\QueryObjectModelConstantsInterface;
 use PHPCR\Query\QueryInterface;
@@ -157,6 +159,7 @@ public function testDepthOnMove(): void
         $topic3->addNode('page3');
         $this->session->save();
 
+        $this->assertInstanceOf(WritingInterface::class, $this->transport);
         $this->transport->moveNodeImmediately('/topic2/page2', '/topic1/page1/page2');
 
         $this->transport->moveNodeImmediately('/topic3', '/topic1/page1/page2/topic3');
@@ -323,7 +326,7 @@ public function testPropertyLengthAttribute(): void
 
             $values = $xpath->query('sv:value', $propertyElement->item(0));
 
-            /** @var $value \DOMElement */
+            /** @var \DOMElement $value */
             foreach ($values as $index => $value) {
                 $lengthAttribute = $value->attributes->getNamedItem('length');
                 if (null === $lengthAttribute) {
diff --git a/tests/Jackalope/Transport/DoctrineDBAL/DeleteCascadeTest.php b/tests/Transport/DoctrineDBAL/DeleteCascadeTest.php
similarity index 95%
rename from tests/Jackalope/Transport/DoctrineDBAL/DeleteCascadeTest.php
rename to tests/Transport/DoctrineDBAL/DeleteCascadeTest.php
index d9deb886e..f14521f9b 100644
--- a/tests/Jackalope/Transport/DoctrineDBAL/DeleteCascadeTest.php
+++ b/tests/Transport/DoctrineDBAL/DeleteCascadeTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Jackalope\Transport\DoctrineDBAL;
+namespace Jackalope\Tests\Transport\DoctrineDBAL;
 
 use Doctrine\DBAL\Platforms\SqlitePlatform;
-use Jackalope\Test\FunctionalTestCase;
+use Jackalope\Tests\FunctionalTestCase;
 use PHPCR\PropertyType;
 
 class DeleteCascadeTest extends FunctionalTestCase
diff --git a/tests/Jackalope/Transport/DoctrineDBAL/PrefetchTest.php b/tests/Transport/DoctrineDBAL/PrefetchTest.php
similarity index 95%
rename from tests/Jackalope/Transport/DoctrineDBAL/PrefetchTest.php
rename to tests/Transport/DoctrineDBAL/PrefetchTest.php
index 1c83a4664..f8fcb6600 100644
--- a/tests/Jackalope/Transport/DoctrineDBAL/PrefetchTest.php
+++ b/tests/Transport/DoctrineDBAL/PrefetchTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Jackalope\Transport\DoctrineDBAL;
+namespace Jackalope\Tests\Transport\DoctrineDBAL;
 
-use Jackalope\Test\FunctionalTestCase;
+use Jackalope\Tests\FunctionalTestCase;
 
 class PrefetchTest extends FunctionalTestCase
 {
diff --git a/tests/Jackalope/Transport/DoctrineDBAL/Query/QOMWalkerTest.php b/tests/Transport/DoctrineDBAL/Query/QOMWalkerTest.php
similarity index 98%
rename from tests/Jackalope/Transport/DoctrineDBAL/Query/QOMWalkerTest.php
rename to tests/Transport/DoctrineDBAL/Query/QOMWalkerTest.php
index 63e728b32..fa5503491 100644
--- a/tests/Jackalope/Transport/DoctrineDBAL/Query/QOMWalkerTest.php
+++ b/tests/Transport/DoctrineDBAL/Query/QOMWalkerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Jackalope\Transport\DoctrineDBAL\Query;
+namespace Jackalope\Tests\Transport\DoctrineDBAL\Query;
 
 use Doctrine\DBAL\Platforms\PostgreSQL94Platform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
@@ -10,10 +10,12 @@
 use Jackalope\Query\QOM\PropertyValue;
 use Jackalope\Query\QOM\QueryObjectModel;
 use Jackalope\Query\QOM\QueryObjectModelFactory;
-use Jackalope\Test\TestCase;
+use Jackalope\Tests\TestCase;
+use Jackalope\Transport\DoctrineDBAL\Query\QOMWalker;
 use PHPCR\NodeType\NodeTypeManagerInterface;
 use PHPCR\Query\InvalidQueryException;
 use PHPCR\Query\QOM\QueryObjectModelConstantsInterface;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class QOMWalkerTest extends TestCase
 {
@@ -28,7 +30,7 @@ class QOMWalkerTest extends TestCase
     private $walker;
 
     /**
-     * @var NodeTypeManagerInterface
+     * @var NodeTypeManagerInterface&MockObject
      */
     private $nodeTypeManager;
 
diff --git a/tests/Jackalope/Transport/DoctrineDBAL/XmlParser/XmlToPropsParserTest.php b/tests/Transport/DoctrineDBAL/XmlParser/XmlToPropsParserTest.php
similarity index 97%
rename from tests/Jackalope/Transport/DoctrineDBAL/XmlParser/XmlToPropsParserTest.php
rename to tests/Transport/DoctrineDBAL/XmlParser/XmlToPropsParserTest.php
index 720af65f3..2b3bbba4a 100644
--- a/tests/Jackalope/Transport/DoctrineDBAL/XmlParser/XmlToPropsParserTest.php
+++ b/tests/Transport/DoctrineDBAL/XmlParser/XmlToPropsParserTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Jackalope\Transport\DoctrineDBAL\XmlParser;
+namespace Jackalope\Tests\Transport\DoctrineDBAL\XmlParser;
 
 use Jackalope\Factory;
-use Jackalope\Test\TestCase;
+use Jackalope\Tests\TestCase;
+use Jackalope\Transport\DoctrineDBAL\XmlParser\XmlToPropsParser;
 use PHPCR\Util\ValueConverter;
 
 class XmlToPropsParserTest extends TestCase
diff --git a/tests/Jackalope/Transport/DoctrineDBAL/XmlPropsRemover/XmlPropsRemoverTest.php b/tests/Transport/DoctrineDBAL/XmlPropsRemover/XmlPropsRemoverTest.php
similarity index 96%
rename from tests/Jackalope/Transport/DoctrineDBAL/XmlPropsRemover/XmlPropsRemoverTest.php
rename to tests/Transport/DoctrineDBAL/XmlPropsRemover/XmlPropsRemoverTest.php
index daebcc189..703e005b4 100644
--- a/tests/Jackalope/Transport/DoctrineDBAL/XmlPropsRemover/XmlPropsRemoverTest.php
+++ b/tests/Transport/DoctrineDBAL/XmlPropsRemover/XmlPropsRemoverTest.php
@@ -1,10 +1,11 @@
 <?php
 
-namespace Jackalope\Transport\DoctrineDBAL\XmlPropsRemover;
+namespace Jackalope\Tests\Transport\DoctrineDBAL\XmlPropsRemover;
 
 use Jackalope\Factory;
-use Jackalope\Test\TestCase;
+use Jackalope\Tests\TestCase;
 use Jackalope\Transport\DoctrineDBAL\XmlParser\XmlToPropsParser;
+use Jackalope\Transport\DoctrineDBAL\XmlPropsRemover\XmlPropsRemover;
 use PHPCR\Util\ValueConverter;
 
 class XmlPropsRemoverTest extends TestCase
diff --git a/tests/generate_fixtures.php b/tests/generate_fixtures.php
index d46273a6b..875a708ca 100755
--- a/tests/generate_fixtures.php
+++ b/tests/generate_fixtures.php
@@ -1,7 +1,7 @@
 <?php
 
-use Jackalope\Test\Fixture\DBUnitFixtureXML;
-use Jackalope\Test\Fixture\JCRSystemXML;
+use Jackalope\Tests\Test\Fixture\DBUnitFixtureXML;
+use Jackalope\Tests\Test\Fixture\JCRSystemXML;
 
 /**
  * Convert Jackalope Document or System Views into PHPUnit DBUnit Fixture XML files.