diff --git a/tests/BootstrapperTest.php b/tests/BootstrapperTest.php
index ba4ea41a..2b1d40e4 100644
--- a/tests/BootstrapperTest.php
+++ b/tests/BootstrapperTest.php
@@ -326,6 +326,14 @@ test('local storage public urls are generated correctly', function() {
     expect(File::isDirectory($tenantStoragePath))->toBeFalse();
 });
 
+test('MailTenancyBootstrapper maps tenant properties to config as specified in the $credentialsMap property', function() {
+
+});
+
+test('MailTenancyBootstrapper reverts the config to default when tenancy ends', function() {
+
+});
+
 function getDiskPrefix(string $disk): string
 {
     /** @var FilesystemAdapter $disk */
diff --git a/tests/MailTest.php b/tests/MailTest.php
new file mode 100644
index 00000000..e9149fd0
--- /dev/null
+++ b/tests/MailTest.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+test('tenancy swaps MailManager instance for an instance of TenancyMailManager', function() {
+
+});
+
+test('TenancyMailManager makes the mailers in the $tenantMailers property use the correct credentials by re-resolving them', function() {
+
+});