--- a/tubes/test/test_tube.py
+++ b/tubes/test/test_tube.py
@@ -919,59 +919,3 @@
         errors = self.flushLoggedErrors(ZeroDivisionError)
         self.assertEquals(len(errors), 1)
         self.assertEquals(ff.flowIsStopped, True)
-
-
-
-class TodoTests(TestCase):
-    """
-    Todo'd tests that should all be fixed and deleted soon, mostly for error
-    handling.
-    """
-
-    todo = "not just yet"
-
-    def test_receivedRaises(self):
-        """
-        If L{ITube.received} raises an exception, the exception will be logged,
-        and...
-        """
-        self.fail()
-
-
-    def test_stoppedRaises(self):
-        """
-        If L{ITube.stopped} raises an exception, the exception will be logged,
-        and...
-        """
-        self.fail()
-
-
-    def test_iterOnResultRaises(self):
-        """
-        When the iterator returned from L{ITube}.
-        """
-        self.fail()
-
-
-    def test_nextOnIteratorRaises(self):
-        """
-        If L{next} on the iterator returned from L{ITube.started} (OR OTHER)
-        raises an exception, the exception will be logged, and...
-        """
-        self.fail()
-
-
-    def test_deferredFromNextOnIteratorFails(self):
-        """
-        If L{next} on the iterator returned from L{ITube.started} (OR OTHER)
-        returns a L{Deferred} which then fails, the failure will be logged,
-        and...
-        """
-        self.fail()
-
-
-    def test_reassembleRaises(self):
-        """
-        If L{IDivertable.reassemble} raises an exception, then...
-        """
-        self.fail()