diff --git a/HACKING b/HACKING
index 6c50d95c..a40b6b17 100644
--- a/HACKING
+++ b/HACKING
@@ -30,3 +30,11 @@ We try to be quite consistent, but of course, that's not always possible.
   Wrong: if (HACK) /* TODO: remove hack */
 
 * Use UNIX new lines (\n), not windows (\r\n) or old Mac ones (\r)
+
+== TESTING/OPTIMIZATION ==
+
+TODO: Add some information here about testing/validation/etc.
+Information about how/when to use :regressions might be nice.
+Additionally, maybe there should be some benchmark information here --
+something to let a developer know what's "too" slow...? Or general
+guidelines about optimization?
diff --git a/vimperator/TODO b/vimperator/TODO
index 23fde543..292cd28d 100644
--- a/vimperator/TODO
+++ b/vimperator/TODO
@@ -96,5 +96,6 @@ FEATURES:
 3 add a command-line window (:help cmdline-window in Vim). 
 3 Splitting Windows with [:sp :vsp ctrl-w,s ctrl-w,v] and closing with [ctrl-w,q], moving with [ctrl-w,w or tab]
   have a look into the split browser extension
+1 Add information to liberator/HACKING file about testing and optimization
 - many other ideas are listed in the wiki