diff --git a/test/Jamfile b/test/Jamfile
index 0392f71bd..8e11ae707 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -1,10 +1,10 @@
 use-project /torrent : .. ;
 
 exe test_upnp : test_upnp.cpp /torrent//torrent
-	: <link>static <threading>multi <logging>verbose <upnp-logging>on ;
+	: <link>static <threading>multi <debug-iterators>on <logging>verbose <upnp-logging>on ;
 
 exe test_natpmp : test_natpmp.cpp /torrent//torrent
-	: <link>static <threading>multi <logging>verbose <upnp-logging>on ;
+	: <link>static <threading>multi <debug-iterators>on <logging>verbose <upnp-logging>on ;
 
 lib test_common
 	:
@@ -25,6 +25,7 @@ project
    : default-build
 	<threading>multi
 	<invariant-checks>full
+	<debug-iterators>on
    ;