diff --git a/geo.t b/geo.t
index 95e384b9..21276c70 100644
--- a/geo.t
+++ b/geo.t
@@ -189,6 +189,8 @@ http {
 
 EOF
 
+$t->write_file('nginx.conf', $t->read_file('nginx.conf') =~ s/ geo\./ *geo./gr)
+	if $t->has_version('1.29.8');
 $t->write_file('1', '');
 $t->write_file('2', '');
 $t->write_file('geo.conf', '127.0.0.0/8  loopback;');
diff --git a/geo_binary.t b/geo_binary.t
index 52dd58f8..52da363b 100644
--- a/geo_binary.t
+++ b/geo_binary.t
@@ -22,8 +22,6 @@ use Test::Nginx;
 select STDERR; $| = 1;
 select STDOUT; $| = 1;
 
-plan(skip_all => 'long configuration parsing') unless $ENV{TEST_NGINX_UNSAFE};
-
 my $t = Test::Nginx->new()->has(qw/http geo/);
 
 $t->write_file_expand('nginx.conf', <<'EOF');
diff --git a/stream_geo.t b/stream_geo.t
index be99b109..86cf1645 100644
--- a/stream_geo.t
+++ b/stream_geo.t
@@ -218,6 +218,8 @@ stream {
 
 EOF
 
+$t->write_file('nginx.conf', $t->read_file('nginx.conf') =~ s/ geo\./ *geo./gr)
+	if $t->has_version('1.29.8');
 $t->write_file('geo.conf', '127.0.0.0/8  loopback;');
 $t->write_file('geo-ranges.conf', '127.0.0.0-127.255.255.255  loopback;');
 
diff --git a/stream_geo_binary.t b/stream_geo_binary.t
index cb2f5948..433acce7 100644
--- a/stream_geo_binary.t
+++ b/stream_geo_binary.t
@@ -23,8 +23,6 @@ use Test::Nginx::Stream qw/ stream /;
 select STDERR; $| = 1;
 select STDOUT; $| = 1;
 
-plan(skip_all => 'long configuration parsing') unless $ENV{TEST_NGINX_UNSAFE};
-
 my $t = Test::Nginx->new()->has(qw/stream stream_return stream_geo/);
 
 $t->write_file_expand('nginx.conf', <<'EOF');