diff --git a/src/Traits/BootstrapsTenancy.php b/src/Traits/BootstrapsTenancy.php
index cbfd9465..624b2180 100644
--- a/src/Traits/BootstrapsTenancy.php
+++ b/src/Traits/BootstrapsTenancy.php
@@ -41,6 +41,10 @@ trait BootstrapsTenancy
 
     public function end()
     {
+        array_map(function ($listener) {
+            $listener($this);
+        }, $this->listeners['ending']);
+
         $this->initialized = false;
 
         $this->disconnectDatabase();
@@ -49,6 +53,10 @@ trait BootstrapsTenancy
         }
         $this->untagCache();
         $this->resetFileSystemRootPaths();
+
+        array_map(function ($listener) {
+            $listener($this);
+        }, $this->listeners['ended']);
     }
 
     public function switchDatabaseConnection()
diff --git a/test b/test
index 5516ec57..ff55e60b 100755
--- a/test
+++ b/test
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # for development
 docker-compose up -d
@@ -6,4 +7,4 @@ printf "Variant 1\n\n"
 TENANCY_TEST_REDIS_TENANCY=1 TENANCY_TEST_REDIS_CLIENT=phpredis docker-compose exec test vendor/bin/phpunit --coverage-php coverage/1.cov "$@"
 printf "Variant 2\n\n"
 TENANCY_TEST_REDIS_TENANCY=0 TENANCY_TEST_REDIS_CLIENT=predis docker-compose exec test vendor/bin/phpunit --coverage-php coverage/2.cov "$@"
-docker-compose exec test vendor/bin/phpcov merge --clover clover.xml coverage/
\ No newline at end of file
+docker-compose exec test vendor/bin/phpcov merge --clover clover.xml coverage/