diff --git a/tests/library/Class/MailTest.php b/tests/library/Class/MailTest.php
index 35d671a28ea078fc543af822a590e8a15a3c4dbb..63d512d240a884cee70be42c483329f388ae4583 100644
--- a/tests/library/Class/MailTest.php
+++ b/tests/library/Class/MailTest.php
@@ -58,15 +58,16 @@ class Class_MailTesting extends Class_Mail {
 
 
 
-class MailToZorkFromFlorenceTest extends PHPUnit_Framework_TestCase {
+class MailToZorkFromFlorenceTest extends Storm_Test_ModelTestCase {
 	public function setUp() {
 		parent::setUp();
 		Class_CosmoVar::getLoader()
 			->newInstanceWithId('mail_admin')
 			->setValeur('florence@astrolabe-melun.fr');
 
-		Class_Profil::getCurrentProfil()
-			->setMailSite('');
+
+		Class_Profil::getCurrentProfil()->setMailSite('');
+		Class_Profil::getPortail()->setMailSite('');
 
 		$this->_mail_testing = new Class_MailTesting();
 		$this->_mail_testing->mailReturns(true);
@@ -111,13 +112,19 @@ class MailToZorkFromFlorenceTest extends PHPUnit_Framework_TestCase {
 
 
 
-class MailErrorsTest extends PHPUnit_Framework_TestCase {
+class MailErrorsTest extends Storm_Test_ModelTestCase {
+	public function setUp() {
+		parent::setUp();
+		Class_Profil::getCurrentProfil()->setMailSite('');
+		Class_Profil::getPortail()->setMailSite('');
+	}
+
 	/** @test */
 	function withoutMailAdminShouldReturnErrorMessage() {
 		Class_CosmoVar::getLoader()
 			->newInstanceWithId('mail_admin')
 			->setValeur('');
-		Class_Profil::getCurrentProfil()->setMailSite('');
+
 		$mail_testing = new Class_MailTesting();
 		$mail_testing->mailReturns(true);