diff --git a/functional_tests/todo.org b/functional_tests/todo.org
index f69c1274b..07bd58c5b 100644
--- a/functional_tests/todo.org
+++ b/functional_tests/todo.org
@@ -7,13 +7,6 @@
 ** TODO Scenario: Make user active
 ** TODO Scenario: Change user password
 
-* Feature: Software Upgrades
-** TODO Scenario: Disable automatic upgrades
-** TODO Scenario: Enable automatic upgrades
-
-* Feature: Date & Time
-** TODO Scenario: Change timezone
-
 * Feature: Help
 ** TODO Scenario: Visit the wiki
 ** TODO Scenario: Visit the mailing list
@@ -21,15 +14,6 @@
 ** TODO Scenario: View the manual
 ** TODO Scenario: View the about page
 
-* Feature: Monkeysphere
-** TODO Import key
-
-* Feature: Tor
-** TODO Scenario: Disable Tor Hidden Service
-** TODO Scenario: Enable Tor Hidden Service
-** TODO Scenario: Disable software package download over Tor
-** TODO Scenario: Enable software package download over Tor
-
 * Feature: Bookmarks
 ** TODO Enable/Disable
 
@@ -44,17 +28,8 @@
 ** TODO Scenario: Configure freedns.afraid.org service
 ** TODO Scenario: Configure other update URL service
 
-* Feature: News Feed Reader
-** TODO Enable/Disable
-
 * Feature: Public Visibility
-** TODO Scenario: Enable PageKite
-** TODO Scenario: Disable PageKite
 ** TODO Scenario: Enable standard services
 ** TODO Scenario: Disable standard services
 ** TODO Scenario: Add custom service
 ** TODO Scenario: Delete custom service
-
-* Feature: Wiki and Blog
-** TODO Create wiki
-** TODO Delete wiki