diff --git a/py/doc/TODO.txt b/py/doc/TODO.txt
index e74e188c6..2ee113d92 100644
--- a/py/doc/TODO.txt
+++ b/py/doc/TODO.txt
@@ -22,6 +22,10 @@ py.test
 
 - document py.test's conftest.py approach
 
+- review and optimize skip-handling (it can be quite slow in
+  certain situations because e.g. setup/teardown is fully performed 
+  although we have "skip by keyword" and could detect this early)
+
 py.execnet
 --------------