diff --git a/src/allmydata/test/test_magic_folder.py b/src/allmydata/test/test_magic_folder.py
index 83ba4abbc..3b41f6d7d 100644
--- a/src/allmydata/test/test_magic_folder.py
+++ b/src/allmydata/test/test_magic_folder.py
@@ -1483,10 +1483,10 @@ class SingleMagicFolderTestMixin(MagicFolderCLITestMixin, ShouldFailMixin, Reall
         return d.result
 
     def tearDown(self):
-        d = super(SingleMagicFolderTestMixin, self).tearDown()
+        d = DeferredContext(super(SingleMagicFolderTestMixin, self).tearDown())
         d.addCallback(self.cleanup)
         shutil.rmtree(self.basedir, ignore_errors=True)
-        return d
+        return d.result
 
     def _createdb(self):
         dbfile = abspath_expanduser_unicode(u"magicfolder_default.sqlite", base=self.basedir)