diff --git a/source/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java b/source/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
index 413848b88a..1e74eb42c0 100644
--- a/source/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
+++ b/source/java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
@@ -89,10 +89,11 @@ public class SiteServiceTest extends BaseWebScriptTest
         this.nodeService = (NodeService)getServer().getApplicationContext().getBean("NodeService");
         this.authorityService = (AuthorityService)getServer().getApplicationContext().getBean("AuthorityService");
         
-        // TODO MER 20/11/2009 Bodge - turn off email sending to prevent errors during unit testing 
-        // (or sending out email by accident from tests)
-        MailActionExecuter mail = (MailActionExecuter)getServer().getApplicationContext().getBean("mail");
-        mail.setTestMode(true);
+        // We're using a MailActionExecuter defined in outboundSMTP-test-context.xml which
+        // sets the testMode property to true via spring injection. This will prevent emails
+        // from being sent from within this test case.
+        // This MailExecutorAction bean is named "test-mail" but is in all other respects equivalent to the
+        // 'real' executer bean. It is automatically included during OutboundSMTP subsystem startup.
         
         this.authenticationComponent.setSystemUserAsCurrentUser();