diff --git a/core/email.class.inc.php b/core/email.class.inc.php
index 193d1e53e..7f92608e9 100644
--- a/core/email.class.inc.php
+++ b/core/email.class.inc.php
@@ -58,7 +58,7 @@ class EMail
 	public function __construct()
 	{
 		$this->m_aData = array();
-		$this->m_oMessage = Swift_Message::newInstance();
+		$this->m_oMessage = new Swift_Message();
 		$this->SetRecipientFrom(MetaModel::GetConfig()->Get('email_default_sender_address'), MetaModel::GetConfig()->Get('email_default_sender_label'));
 	}
 
@@ -172,7 +172,7 @@ class EMail
 			$sUserName = self::$m_oConfig->Get('email_transport_smtp.username');
 			$sPassword = self::$m_oConfig->Get('email_transport_smtp.password');
 
-			$oTransport = Swift_SmtpTransport::newInstance($sHost, $sPort, $sEncryption);
+			$oTransport = new Swift_SmtpTransport($sHost, $sPort, $sEncryption);
 			if (strlen($sUserName) > 0)
 			{
 				$oTransport->setUsername($sUserName);
@@ -181,20 +181,20 @@ class EMail
 			break;
 
 		case 'Null':
-			$oTransport = Swift_NullTransport::newInstance();
+			$oTransport = new Swift_NullTransport();
 			break;
 		
 		case 'LogFile':
-			$oTransport = Swift_LogFileTransport::newInstance();
+			$oTransport = new Swift_LogFileTransport();
 			$oTransport->setLogFile(APPROOT.'log/mail.log');
 			break;
 			
 		case 'PHPMail':
 		default:
-			$oTransport = Swift_MailTransport::newInstance();
+			$oTransport = new Swift_SendmailTransport();
 		}
 
-		$oMailer = Swift_Mailer::newInstance($oTransport);
+		$oMailer = new Swift_Mailer($oTransport);
 
 		$aFailedRecipients = array();
 		$this->m_oMessage->setMaxLineLength(0);
@@ -377,7 +377,7 @@ class EMail
 			$this->m_aData['attachments'] = array();
 		}
 		$this->m_aData['attachments'][] = array('data' => base64_encode($data), 'filename' => $sFileName, 'mimeType' => $sMimeType);
-		$this->m_oMessage->attach(Swift_Attachment::newInstance($data, $sFileName, $sMimeType));
+		$this->m_oMessage->attach(new Swift_Attachment($data, $sFileName, $sMimeType));
 	}
 
 	public function SetSubject($sSubject)
diff --git a/test/phpunit.xml.dist b/test/phpunit.xml.dist
index 645b6bedd..fa2d9d132 100644
--- a/test/phpunit.xml.dist
+++ b/test/phpunit.xml.dist
@@ -5,6 +5,7 @@
         bootstrap="unittestautoload.php"
         backupGlobals="true"
         colors="true"
+        columns="120"
         convertErrorsToExceptions="true"
         convertNoticesToExceptions="true"
         convertWarningsToExceptions="true"
@@ -18,8 +19,10 @@
 >
 
   <php>
-    <ini name="display_errors" value="true"/>
-    <ini name="error_reporting" value="true"/>
+    <ini name="error_reporting" value="E_ALL"/>
+    <ini name="display_errors" value="On"/>
+    <ini name="log_errors" value="On"/>
+    <ini name="html_errors" value="Off"/>
   </php>
 
   <testsuites>
diff --git a/test/postbuild_integration.xml.dist b/test/postbuild_integration.xml.dist
index 34aab85da..0a3ce6ef0 100644
--- a/test/postbuild_integration.xml.dist
+++ b/test/postbuild_integration.xml.dist
@@ -17,6 +17,13 @@
         verbose="true"
 >
 
+    <php>
+        <ini name="error_reporting" value="E_ALL"/>
+        <ini name="display_errors" value="On"/>
+        <ini name="log_errors" value="On"/>
+        <ini name="html_errors" value="On"/>
+    </php>
+
     <testsuites>
         <testsuite name="PostBuildIntegration">
             <directory>postbuild_integration</directory>