diff --git a/doc/Changelog b/doc/Changelog
index 978392fe0..2e80d4611 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
 	- configure --enable-debug is needed for dependency generation
 	  for assertions and for compiler warnings.
 	- ldns.tgz updated with ldns-trunk (where buffer.h is updated).
+	- fix lint, unit test in optimize mode.
 	
 11 January 2008: Wouter
 	- man page, warning removed.
diff --git a/testcode/unitmain.h b/testcode/unitmain.h
index f34d9f797..f7bb06594 100644
--- a/testcode/unitmain.h
+++ b/testcode/unitmain.h
@@ -45,7 +45,11 @@
 /** number of tests done */
 extern int testcount;
 /** test bool x, exits on failure, increases testcount. */
+#ifdef DEBUG_UNBOUND
 #define unit_assert(x) do {testcount++; log_assert(x);} while(0)
+#else
+#define unit_assert(x) do {testcount++; if(!(x)) { fprintf(stderr, "assertion failure %s:%d\n", __FILE__, __LINE__); exit(1);}} while(0)
+#endif
 
 /** unit test lruhashtable implementation */
 void lruhash_test();