diff --git a/grpc.t b/grpc.t
index f61cb36..8972b19 100644
--- a/grpc.t
+++ b/grpc.t
@@ -24,7 +24,7 @@
 select STDOUT; $| = 1;
 
 my $t = Test::Nginx->new()->has(qw/http rewrite http_v2 grpc/)
-	->has(qw/upstream_keepalive/)->plan(146);
+	->has(qw/upstream_keepalive/)->plan(145);
 
 $t->write_file_expand('nginx.conf', <<'EOF');
 
@@ -619,12 +619,6 @@
 $f->{data}('Hello');
 $f->{http_end}();
 
-$frames = $f->{http_start}('/SetArgs esc');
-($frame) = grep { $_->{type} eq "HEADERS" } @$frames;
-is($frame->{headers}{':path'}, '/SetArgs%20esc', 'uri escape');
-$f->{data}('Hello');
-$f->{http_end}();
-
 $frames = $f->{http_start}('/');
 ($frame) = grep { $_->{type} eq "HEADERS" } @$frames;
 is($frame->{headers}{':path'}, '/', 'root index');
diff --git a/proxy_cache_use_stale.t b/proxy_cache_use_stale.t
index 78eb2de..812018b 100644
--- a/proxy_cache_use_stale.t
+++ b/proxy_cache_use_stale.t
@@ -148,10 +148,9 @@
 $t->write_file('t9.html', 'SEE-THIS' x 1024);
 $t->write_file('ssi.html', 'xxx <!--#include virtual="/t9.html" --> xxx');
 $t->write_file('escape.html', 'SEE-THIS');
-$t->write_file('escape html', 'SEE-THIS');
 $t->write_file('regexp.html', 'SEE-THIS');
 
-$t->run()->plan(36);
+$t->run()->plan(34);
 
 ###############################################################################
 
@@ -174,7 +173,6 @@
 get('/updating/tt.html', 'max-age=1, stale-if-error=5');
 get('/t8.html', 'stale-while-revalidate=10');
 get('/escape.htm%6C', 'max-age=1, stale-while-revalidate=10');
-get('/escape html', 'max-age=1, stale-while-revalidate=10');
 get('/regexp.html', 'max-age=1, stale-while-revalidate=10');
 
 sleep 2;
@@ -263,15 +261,11 @@
 # ticket #1430, uri escaping in cloned subrequests
 
 $t->write_file('escape.html', 'SEE-THAT');
-$t->write_file('escape html', 'SEE-THAT');
 
 get('/escape.htm%6C', 'max-age=1');
-get('/escape html', 'max-age=1');
 
 like(http_get('/escape.htm%6C'), qr/HIT/, 'escaped after escaped');
 like(http_get('/escape.html'), qr/MISS/, 'unescaped after escaped');
-like(http_get('/escape html'), qr/HIT/, 'space after escaped space');
-like(http_get('/escape%20html'), qr/HIT/, 'escaped space after escaped space');
 
 ###############################################################################