diff --git a/py/doc/TODO.txt b/py/doc/TODO.txt
index cc864f58b..70c327906 100644
--- a/py/doc/TODO.txt
+++ b/py/doc/TODO.txt
@@ -46,6 +46,9 @@ refactorings
 
 - consider setup/teardown for generative tests (M826)
 
+- fix teardown problems regarding when teardown is done (should be done
+  after test run, not before the next one)
+
 features 
 --------------