diff --git a/doc/BUGS b/doc/BUGS
index 850c9d9fe..22277617e 100644
--- a/doc/BUGS
+++ b/doc/BUGS
@@ -79,6 +79,7 @@ Misc
 ----
 
 - All kind of FIXMEs
+- Tab positions/focusing is confusing (when closing tabs or opening a new one)
 - On doodle, when modifying something on http://doodle.com/create and clicking
   a link to leave the page, with some random clicking it's somehow possible to
   get out of yesno mode.
@@ -92,6 +93,11 @@ Misc
 - Current font handling is rather broken (rejecting invalid values / setting
   multiple font families)
 
+Tests
+-----
+
+- Use unittest.Mock and especially unittest.patch more.
+
 Upstream Bugs
 =============
 
diff --git a/doc/TODO b/doc/TODO
index 7f54f7e7d..9ece30a0f 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -112,7 +112,6 @@ style
 
 - Use list models for completion and a proxy model which converts them to a
   tree?
-- Use unittest's subtests for typical "for ... in ..." tests.
 
 dwb keybindings to possibly implement
 =====================================