--- a/not_modified.t
+++ b/not_modified.t
@@ -52,17 +52,17 @@ EOF
 
 ###############################################################################
 
-like(http_get_ims('/t', 'Wed, 08 Jul 2037 22:53:52 GMT'), qr/304/,
+like(http_get_ims('/t', 'Wed, 08 Jul 2037 22:53:52 GMT'), qr/ 304 /,
 	'0x7F000000');
-like(http_get_ims('/t', 'Tue, 19 Jan 2038 03:14:07 GMT'), qr/304/,
+like(http_get_ims('/t', 'Tue, 19 Jan 2038 03:14:07 GMT'), qr/ 304 /,
 	'0x7FFFFFFF');
 
 SKIP: {
 	skip "only for 32-bit time_t", 2 if (gmtime(0xFFFFFFFF))[5] == 206;
 
-	like(http_get_ims('/t', 'Tue, 19 Jan 2038 03:14:08 GMT'), qr/200/,
+	like(http_get_ims('/t', 'Tue, 19 Jan 2038 03:14:08 GMT'), qr/ 200 /,
 		'0x7FFFFFFF + 1');
-	like(http_get_ims('/t', 'Fri, 25 Feb 2174 09:42:23 GMT'), qr/200/,
+	like(http_get_ims('/t', 'Fri, 25 Feb 2174 09:42:23 GMT'), qr/ 200 /,
 		'0x17FFFFFFF');
 }
 
@@ -74,29 +74,29 @@ my ($t1, $etag);
 $t1 =~ /ETag: (".*")/;
 $etag = $1;
 
-like(http_get_inm('/t', $etag), qr/304/, 'if-none-match');
-like(http_get_inm('/t', '"foo"'), qr/200/, 'if-none-match fail');
-like(http_get_inm('/t', '"foo", "bar", ' . $etag . ' , "baz"'), qr/304/,
+like(http_get_inm('/t', $etag), qr/ 304 /, 'if-none-match');
+like(http_get_inm('/t', '"foo"'), qr/ 200 /, 'if-none-match fail');
+like(http_get_inm('/t', '"foo", "bar", ' . $etag . ' , "baz"'), qr/ 304 /,
 	'if-none-match with complex list');
-like(http_get_inm('/t', '*'), qr/304/, 'if-none-match all');
+like(http_get_inm('/t', '*'), qr/ 304 /, 'if-none-match all');
 
 TODO: {
 local $TODO = 'not yet' unless $t->has_version('1.7.3');
 
-like(http_get_inm('/t', 'W/' . $etag), qr/304/, 'if-none-match weak');
+like(http_get_inm('/t', 'W/' . $etag), qr/ 304 /, 'if-none-match weak');
 
 }
 
-like(http_get_im('/t', $etag), qr/200/, 'if-match');
-like(http_get_im('/t', '"foo"'), qr/412/, 'if-match fail');
+like(http_get_im('/t', $etag), qr/ 200 /, 'if-match');
+like(http_get_im('/t', '"foo"'), qr/ 412 /, 'if-match fail');
 like(http_get_im('/t', '"foo", "bar", ' . "\t" . $etag . ' , "baz"'),
-	qr/200/, 'if-match with complex list');
-like(http_get_im('/t', '*'), qr/200/, 'if-match all');
-like(http_get_im('/t', 'W/' . $etag), qr/412/, 'if-match weak fail');
+	qr/ 200 /, 'if-match with complex list');
+like(http_get_im('/t', '*'), qr/ 200 /, 'if-match all');
+like(http_get_im('/t', 'W/' . $etag), qr/ 412 /, 'if-match weak fail');
 
 # server MUST ignore precondition if its response wouldn't be 2xx or 412
 
-like(http_get_im('/nx', '"foo"'), qr/404/, 'if-match ignored with 404');
+like(http_get_im('/nx', '"foo"'), qr/ 404 /, 'if-match ignored with 404');
 
 ###############################################################################