diff --git a/releng/TODO b/releng/TODO
index 2a073abb..1de22c80 100644
--- a/releng/TODO
+++ b/releng/TODO
@@ -12,3 +12,8 @@
   then we will need configuration means to enable this. By default
   it should not risk to burn one-time media which sit in the drive
   by mere accident.
+
+* Investigate the possibility to write some cunit-based tests
+  (http://cunit.sourceforge.net) for both xorriso.h and libisoburn.h API's.
+  The code samples could be dumped into codesamples/ directory and run by
+  releng_cxx or separate releng_ script.