3 files changed, 5 insertions, 5 deletions
diff --git a/mail/src/leap/mail/adaptors/tests/test_soledad_adaptor.py b/mail/src/leap/mail/adaptors/tests/test_soledad_adaptor.py
index 3dc79fee..bdc2c48f 100644
--- a/mail/src/leap/mail/adaptors/tests/test_soledad_adaptor.py
+++ b/mail/src/leap/mail/adaptors/tests/test_soledad_adaptor.py
@@ -364,7 +364,7 @@ class SoledadMailAdaptorTestCase(SoledadTestMixin):
 
     def test_get_msg_from_metamsg_doc_id(self):
         # TODO complete-me!
-        self.fail()
+        self.skipTest("Not yet implemented")
 
     def test_create_msg(self):
         adaptor = self.get_adaptor()
diff --git a/mail/src/leap/mail/imap/tests/test_imap_store_fetch.py b/mail/src/leap/mail/imap/tests/test_imap_store_fetch.py
index 81f88fe1..a71ff456 100644
--- a/mail/src/leap/mail/imap/tests/test_imap_store_fetch.py
+++ b/mail/src/leap/mail/imap/tests/test_imap_store_fetch.py
@@ -14,9 +14,9 @@ class StoreAndFetchTestCase(IMAP4HelperMixin):
     """
 
     def setUp(self):
-        IMAP4HelperMixin.setUp(self)
         self.received_messages = self.received_uid = None
         self.result = None
+        return IMAP4HelperMixin.setUp(self)
 
     def addListener(self, x):
         pass
diff --git a/mail/src/leap/mail/tests/test_mail.py b/mail/src/leap/mail/tests/test_mail.py
index 2c03933d..2872f15b 100644
--- a/mail/src/leap/mail/tests/test_mail.py
+++ b/mail/src/leap/mail/tests/test_mail.py
@@ -271,7 +271,7 @@ class MessageCollectionTestCase(SoledadTestMixin, CollectionMixin):
     def test_copy_msg(self):
         # TODO ---- update when implementing messagecopier
         # interface
-        self.fail("Not Yet Implemented")
+        self.skipTest("Not yet implemented")
 
     def test_delete_msg(self):
         d = self.add_msg_to_collection()
@@ -390,7 +390,7 @@ class AccountTestCase(SoledadTestMixin):
     # XXX not yet implemented
 
     def test_get_collection_by_docs(self):
-        self.fail("Not Yet Implemented")
+        self.skipTest("Not Yet Implemented")
 
     def test_get_collection_by_tag(self):
-        self.fail("Not Yet Implemented")
+        self.skipTest("Not Yet Implemented")