diff --git a/rubygem-cairo.spec b/rubygem-cairo.spec
index 36f7f65..f99de42 100644
--- a/rubygem-cairo.spec
+++ b/rubygem-cairo.spec
@@ -5,6 +5,8 @@
 %global	gemver		1.16.6
 #%%global	gem_githash	af3e3fc059
 
+%global	need_test_bootstrap	1
+
 # Upstream GIT http://github.com/rcairo/
 
 %undefine        _changelog_trimtime
@@ -12,7 +14,7 @@
 Summary:	Ruby bindings for cairo
 Name:		rubygem-%{gem_name}
 Version:	%{gemver}
-Release:	1%{?dist}
+Release:	1.99%{?dist}
 License:	GPLv2 or Ruby
 URL:		http://cairographics.org/rcairo/
 %if 1
@@ -48,7 +50,7 @@ BuildRequires:	rubygem(test-unit-notify)
 BuildRequires:	rubygem(pkg-config)
 BuildRequires:	rubygem(native-package-installer)
 # Circular dependency
-%if 1
+%if 0%{?need_test_bootstrap} < 1
 BuildRequires:	rubygem(poppler)
 # Make sure at least one font is available for test/test_context.rb:57
 # `initialize': out of memory (NoMemoryError)
@@ -167,12 +169,12 @@ rm -f ./TMPINSTDIR/%{gem_instdir}/{Makefile*,extconf.rb}
 cp -a ./TMPINSTDIR/* %{buildroot}/
 
 %check
-%if 0%{?fedora} >= 21
-export RUBYLIB=$(pwd)/TMPINSTDIR/%{gem_instdir}:$(pwd)/TMPINSTDIR/%{gem_extdir_mri}/
-%else
-export RUBYLIB=$(pwd)/TMPINSTDIR/%{gem_instdir}:$(pwd)/TMPINSTDIR/%{gem_extdir_mri}/lib
+%if 0%{?need_test_bootstrap} >= 1
+exit 0
 %endif
 
+export RUBYLIB=$(pwd)/TMPINSTDIR/%{gem_instdir}:$(pwd)/TMPINSTDIR/%{gem_extdir_mri}/
+
 pushd ./TMPINSTDIR/%{gem_instdir}
 # kill unneeded make process
 rm -rf ./TMPBINDIR
@@ -224,6 +226,10 @@ ruby ./test/run-test.rb
 %{header_dir}/rb_cairo.h
 
 %changelog
+* Thu Dec 31 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.16.6-1.99
+- Rebuild for ruby 3.0
+- Set bootstrap logic for test suite
+
 * Sun Aug  9 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.16.6-1
 - 1.16.6