diff --git a/proxy_extra_data.t b/proxy_extra_data.t
index 9d7b78e..03e8aa4 100644
--- a/proxy_extra_data.t
+++ b/proxy_extra_data.t
@@ -142,14 +142,14 @@
 }
 
 TODO: {
-local $TODO = 'not yet';
+local $TODO = 'not yet' unless $t->has_version('1.19.7');
 
 like(http_get('/unbuf/zero'), qr/200 OK(?!.*NOT-THIS)/s,
 	'unbuffered zero size');
 
 }
 
-$t->todo_alerts() if $t->has_version('1.19.1');
+$t->todo_alerts() if $t->has_version('1.19.1') and !$t->has_version('1.19.7');
 
 ###############################################################################
 
diff --git a/scgi_extra_data.t b/scgi_extra_data.t
index d954f92..aee5b11 100644
--- a/scgi_extra_data.t
+++ b/scgi_extra_data.t
@@ -145,14 +145,14 @@
 }
 
 TODO: {
-local $TODO = 'not yet';
+local $TODO = 'not yet' unless $t->has_version('1.19.7');
 
 like(http_get('/unbuf/zero'), qr/200 OK(?!.*NOT-THIS)/s,
 	'unbuffered zero size');
 
 }
 
-$t->todo_alerts() if $t->has_version('1.19.1');
+$t->todo_alerts() if $t->has_version('1.19.1') and !$t->has_version('1.19.7');
 
 ###############################################################################