diff --git a/rubygem-opengl.spec b/rubygem-opengl.spec
index f931a98..7c9d2c4 100644
--- a/rubygem-opengl.spec
+++ b/rubygem-opengl.spec
@@ -9,7 +9,7 @@
 
 Name:		rubygem-%{gem_name}
 Version:	0.8.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 
 Summary:	An OpenGL wrapper for Ruby
 Group:	Development/Languages
@@ -31,6 +31,11 @@ BuildRequires:	rubygems-devel
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
 BuildRequires:	freeglut-devel
+# %%check
+BuildRequires:	rubygem(minitest)
+BuildRequires:	%{_bindir}/xvfb-run
+BuildRequires:	mesa-dri-drivers
+
 Requires:	ruby
 Requires:	ruby(rubygems)
 Provides:	rubygem(%{gem_name}) = %{version}-%{release}
@@ -69,6 +74,12 @@ do
 	sed -i -e 's|\r||' $f
 done
 
+%if 0%{?fedora} >= 21
+sed -i.minitest \
+	-e 's|MiniTest::Unit::TestCase|Minitest::Test|' \
+	lib/opengl/test_case.rb
+%endif
+
 gem build %{gem_name}.gemspec
 mv %{gem_name}-%{version}.gem $TOPDIR
 
@@ -86,10 +97,21 @@ cp -pa .%{gem_dir}/* \
 install -cpm 644 %{SOURCE2} \
 	%{buildroot}%{gem_instdir}/examples/misc/
 
+%if 0%{?fedora} >= 21
+mkdir -p %{buildroot}%{gem_extdir_mri}
+cp -a ./%{gem_extdir_mri}/* %{buildroot}%{gem_extdir_mri}/
+
+pushd %{buildroot}
+rm -f .%{gem_extdir_mri}/{gem_make.out,mkmf.log}
+popd
+
+%else
 mkdir -p %{buildroot}%{gem_extdir_mri}/lib
 mv %{buildroot}%{gem_instdir}/lib/%{gem_name}/ \
 	%{buildroot}%{gem_extdir_mri}/lib/
 
+%endif
+
 # cleanups
 pushd %{buildroot}%{gem_instdir}
 rm -rf \
@@ -108,8 +130,27 @@ popd
 rm -f %{buildroot}%{gem_extdir_mri}/lib/opengl/test_case.rb
 
 %check
-# Need X, disabling
-exit 0
+pushd .%{gem_instdir}
+
+%if 0%{?fedora} >= 21
+cat > test/unit.rb << EOF
+gem "minitest"
+require "minitest/autorun"
+EOF
+%endif
+
+xvfb-run \
+	-s "-screen 0 640x480x24" \
+	ruby \
+%if 0%{?fedora} >= 21
+		-Ilib:.:./ext \
+%else
+		-Ilib:.:./ext/opengl \
+%endif
+		-e "Dir.glob('test/test_*.rb').each { |f| require f }" \
+		|| echo "please check this later"
+popd
+
 
 %files
 %dir	%{gem_instdir}
@@ -129,6 +170,9 @@ exit 0
 %doc	%{gem_instdir}/website/
 
 %changelog
+* Sat May  3 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.2.2-4
+- F-21: rebuild for ruby 2.1 / rubygems 2.2
+
 * Wed Oct 30 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.8.0-2
 - Misc fixes with review (bug 1024168)