diff --git a/phpunit.xml b/phpunit.xml
index c3e7ff8..660dd3b 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -21,9 +21,6 @@
             <directory suffix=".php">./src/</directory>
         </whitelist>
     </filter>
-    <listeners>
-        <listener class="Mockery\Adapter\Phpunit\TestListener" file="./vendor/mockery/mockery/library/Mockery/Adapter/Phpunit/TestListener.php"></listener>
-    </listeners>
     <logging>
         <log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
         <log type="coverage-html" target="coverage" showUncoveredFiles="true"/>
diff --git a/tests/AdapterCacheTests.php b/tests/AdapterCacheTests.php
index e35b1ec..b63cba7 100644
--- a/tests/AdapterCacheTests.php
+++ b/tests/AdapterCacheTests.php
@@ -1,8 +1,9 @@
 <?php
 
 use League\Flysystem\Cached\Storage\Adapter;
+use PHPUnit\Framework\TestCase;
 
-class AdapterCacheTests extends PHPUnit_Framework_TestCase
+class AdapterCacheTests extends TestCase
 {
     public function testLoadFail()
     {
diff --git a/tests/InspectionTests.php b/tests/InspectionTests.php
index 2f1e3d3..40d4c91 100644
--- a/tests/InspectionTests.php
+++ b/tests/InspectionTests.php
@@ -1,8 +1,9 @@
 <?php
 
 use League\Flysystem\Cached\CachedAdapter;
+use PHPUnit\Framework\TestCase;
 
-class InspectionTests extends PHPUnit_Framework_TestCase {
+class InspectionTests extends TestCase {
 
     public function testGetAdapter()
     {
diff --git a/tests/MemcachedTests.php b/tests/MemcachedTests.php
index 26bb570..e3d9ad9 100644
--- a/tests/MemcachedTests.php
+++ b/tests/MemcachedTests.php
@@ -1,8 +1,9 @@
 <?php
 
 use League\Flysystem\Cached\Storage\Memcached;
+use PHPUnit\Framework\TestCase;
 
-class MemcachedTests extends PHPUnit_Framework_TestCase
+class MemcachedTests extends TestCase
 {
     public function testLoadFail()
     {
diff --git a/tests/MemoryCacheTests.php b/tests/MemoryCacheTests.php
index c5b5f29..7a58dff 100644
--- a/tests/MemoryCacheTests.php
+++ b/tests/MemoryCacheTests.php
@@ -2,8 +2,9 @@
 
 use League\Flysystem\Cached\Storage\Memory;
 use League\Flysystem\Util;
+use PHPUnit\Framework\TestCase;
 
-class MemoryCacheTests extends PHPUnit_Framework_TestCase
+class MemoryCacheTests extends TestCase
 {
     public function testAutosave()
     {
diff --git a/tests/NoopCacheTests.php b/tests/NoopCacheTests.php
index 6c7627c..148616f 100644
--- a/tests/NoopCacheTests.php
+++ b/tests/NoopCacheTests.php
@@ -1,8 +1,9 @@
 <?php
 
 use League\Flysystem\Cached\Storage\Noop;
+use PHPUnit\Framework\TestCase;
 
-class NoopCacheTests extends PHPUnit_Framework_TestCase
+class NoopCacheTests extends TestCase
 {
     public function testNoop()
     {
diff --git a/tests/PhpRedisTests.php b/tests/PhpRedisTests.php
index e63d834..d1ccb65 100644
--- a/tests/PhpRedisTests.php
+++ b/tests/PhpRedisTests.php
@@ -1,8 +1,9 @@
 <?php
 
 use League\Flysystem\Cached\Storage\PhpRedis;
+use PHPUnit\Framework\TestCase;
 
-class PhpRedisTests extends PHPUnit_Framework_TestCase
+class PhpRedisTests extends TestCase
 {
     public function testLoadFail()
     {
diff --git a/tests/PredisTests.php b/tests/PredisTests.php
index 4de073a..e33e104 100644
--- a/tests/PredisTests.php
+++ b/tests/PredisTests.php
@@ -1,8 +1,9 @@
 <?php
 
 use League\Flysystem\Cached\Storage\Predis;
+use PHPUnit\Framework\TestCase;
 
-class PredisTests extends PHPUnit_Framework_TestCase
+class PredisTests extends TestCase
 {
     public function testLoadFail()
     {
diff --git a/tests/Psr6CacheTest.php b/tests/Psr6CacheTest.php
index d7b05a4..d5e5700 100644
--- a/tests/Psr6CacheTest.php
+++ b/tests/Psr6CacheTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use League\Flysystem\Cached\Storage\Psr6Cache;
+use PHPUnit\Framework\TestCase;
 
-class Psr6CacheTests extends PHPUnit_Framework_TestCase
+class Psr6CacheTests extends TestCase
 {
     public function testLoadFail()
     {
diff --git a/tests/StashTest.php b/tests/StashTest.php
index f684737..29e142d 100644
--- a/tests/StashTest.php
+++ b/tests/StashTest.php
@@ -1,8 +1,9 @@
 <?php
 
 use League\Flysystem\Cached\Storage\Stash;
+use PHPUnit\Framework\TestCase;
 
-class StashTests extends PHPUnit_Framework_TestCase
+class StashTests extends TestCase
 {
     public function testLoadFail()
     {