diff --git a/product/ERP5Type/tests/ERP5TypeLiveTestCase.py b/product/ERP5Type/tests/ERP5TypeLiveTestCase.py
index 99a023968d3acb58a74238012a3bc6c461529313..1fa75c0f396135b3e5a0d6ae1cf09b466ac11c60 100644
--- a/product/ERP5Type/tests/ERP5TypeLiveTestCase.py
+++ b/product/ERP5Type/tests/ERP5TypeLiveTestCase.py
@@ -135,7 +135,7 @@ class ERP5TypeLiveTestCase(ERP5TypeTestCaseMixin):
 
       self.abort()
       self._restoreMailHost()
-      if self.activity_tool_subscribed:
+      if getattr(self, "activity_tool_subscribed", False):
         self.portal.portal_activities.subscribe()
         self.commit()
 
diff --git a/product/ERP5Type/tests/ERP5TypeTestCase.py b/product/ERP5Type/tests/ERP5TypeTestCase.py
index 798738b69cffac81045b317cc0e029430f446775..3e0ecba73ee9aa8f962ded4aef46248cd5bccbe6 100644
--- a/product/ERP5Type/tests/ERP5TypeTestCase.py
+++ b/product/ERP5Type/tests/ERP5TypeTestCase.py
@@ -267,10 +267,11 @@ class ERP5TypeTestCaseMixin(ProcessingNodeTestCase, PortalTestCase):
     def _restoreMailHost(self):
       """Restore original Mail Host
       """
-      cls = self.portal.MailHost.__class__
-      if cls.__bases__[0] is DummyMailHostMixin:
-        cls.__bases__ = cls.__bases__[1:]
-        pmc_init_of(cls)
+      if self.portal is not None:
+        cls = self.portal.MailHost.__class__
+        if cls.__bases__[0] is DummyMailHostMixin:
+          cls.__bases__ = cls.__bases__[1:]
+          pmc_init_of(cls)
 
     def pinDateTime(self, date_time):
       # pretend time has stopped at a certain date (i.e. the test runs