diff --git a/source/test-java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java b/source/test-java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java
index 67c36c7927..c5d92832be 100644
--- a/source/test-java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java
+++ b/source/test-java/org/alfresco/repo/invitation/AbstractInvitationServiceImplTest.java
@@ -60,6 +60,7 @@ import org.alfresco.service.cmr.site.SiteService;
 import org.alfresco.service.cmr.site.SiteVisibility;
 import org.alfresco.util.BaseAlfrescoSpringTest;
 import org.alfresco.util.PropertyMap;
+import org.alfresco.util.email.ExtendedMailActionExecutor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.util.ReflectionUtils;
@@ -123,8 +124,8 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
         this.authenticationComponent = (AuthenticationComponent) this.applicationContext
                     .getBean("authenticationComponent");
         this.invitationServiceImpl = (InvitationServiceImpl) applicationContext.getBean("invitationService");
-        this.workflowAdminService = (WorkflowAdminServiceImpl)applicationContext.getBean(WorkflowAdminServiceImpl.NAME); 
-        
+        this.workflowAdminService = (WorkflowAdminServiceImpl)applicationContext.getBean(WorkflowAdminServiceImpl.NAME);
+
         this.templateService = (TemplateServiceImpl)applicationContext.getBean("templateService");
         
         this.startSendEmails = invitationServiceImpl.isSendEmails();
@@ -423,9 +424,17 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
          * Check that system generated invitations can work as well
          */
         {
-           Field faf = mailService.getClass().getDeclaredField("fromDefaultAddress");
-           faf.setAccessible(true);
-           String defaultFromAddress = (String)ReflectionUtils.getField(faf, mailService);
+            Field faf;
+            if (mailService instanceof ExtendedMailActionExecutor)
+            {
+                faf = mailService.getClass().getSuperclass().getDeclaredField("fromDefaultAddress");
+            }
+            else
+            {
+                faf = mailService.getClass().getDeclaredField("fromDefaultAddress");
+            }
+            faf.setAccessible(true);
+            String defaultFromAddress = (String) ReflectionUtils.getField(faf, mailService);
            
            AuthenticationUtil.setFullyAuthenticatedUser(USER_NOEMAIL);
 
@@ -446,7 +455,7 @@ public abstract class AbstractInvitationServiceImplTest extends BaseAlfrescoSpri
            assertEquals(USER_TWO_EMAIL, msg.getAllRecipients()[0].toString());
            
            assertEquals(1, msg.getFrom().length);
-           assertEquals(defaultFromAddress, msg.getFrom()[0].toString());           
+           assertEquals(defaultFromAddress, msg.getFrom()[0].toString());
         }
     }
 
diff --git a/source/test-java/org/alfresco/repo/security/authentication/ResetPasswordServiceImplTest.java b/source/test-java/org/alfresco/repo/security/authentication/ResetPasswordServiceImplTest.java
index 3c9c2c6836..c47d97bd23 100644
--- a/source/test-java/org/alfresco/repo/security/authentication/ResetPasswordServiceImplTest.java
+++ b/source/test-java/org/alfresco/repo/security/authentication/ResetPasswordServiceImplTest.java
@@ -473,8 +473,8 @@ public class ResetPasswordServiceImplTest
                         .setPassword("newPassword")
                         .setWorkflowId(pair.getFirst())
                         .setWorkflowKey(pair.getSecond());
-            // Wait for 4 seconds, so the end timer expires!
-            Thread.sleep(4000);
+            // Wait for 5 seconds, so the end timer expires!
+            Thread.sleep(5000);
             try
             {
                 resetPasswordService.initiateResetPassword(passwordDetails);
diff --git a/source/test-resources/alfresco/extension/subsystems/email/OutboundSMTP/outbound/outboundSMTPTest.properties b/source/test-resources/alfresco/extension/subsystems/email/OutboundSMTP/outbound/outboundSMTPTest.properties
index 5cafa0b8e0..145461bfc0 100755
--- a/source/test-resources/alfresco/extension/subsystems/email/OutboundSMTP/outbound/outboundSMTPTest.properties
+++ b/source/test-resources/alfresco/extension/subsystems/email/OutboundSMTP/outbound/outboundSMTPTest.properties
@@ -8,5 +8,5 @@ mail.from.default=alfresco@test-alfresco.org
 mail.testmessage.send=false
 
 # validate email addresses
-mail.validate.addresses= false
+mail.validate.addresses= true
 dev.email.not.sent=true
\ No newline at end of file