diff --git a/test/rubygems/test_gem_package_task.rb b/test/rubygems/test_gem_package_task.rb
index 0ce9f08b01eb..51b2e6c3bb5f 100644
--- a/test/rubygems/test_gem_package_task.rb
+++ b/test/rubygems/test_gem_package_task.rb
@@ -5,19 +5,8 @@
 
 class TestGemPackageTask < Gem::TestCase
 
-  def setup
-    super
-
-    @original_rake_fileutils_verbosity = RakeFileUtils.verbose_flag
-  end
-
-  def teardown
-    RakeFileUtils.verbose_flag = @original_rake_fileutils_verbosity
-
-    super
-  end
-
   def test_gem_package
+    original_rake_fileutils_verbosity = RakeFileUtils.verbose_flag
     RakeFileUtils.verbose_flag = false
 
     gem = Gem::Specification.new do |g|
@@ -45,6 +34,8 @@ def test_gem_package
 
       assert_path_exists 'pkg/pkgr-1.2.3.gem'
     end
+  ensure
+    RakeFileUtils.verbose_flag = original_rake_fileutils_verbosity
   end
 
   def test_gem_package_prints_to_stdout_by_default
@@ -78,8 +69,6 @@ def test_gem_package_prints_to_stdout_by_default
   end
 
   def test_gem_package_with_current_platform
-    RakeFileUtils.verbose_flag = false
-
     gem = Gem::Specification.new do |g|
       g.name = "pkgr"
       g.version = "1.2.3"
@@ -93,8 +82,6 @@ def test_gem_package_with_current_platform
   end
 
   def test_gem_package_with_ruby_platform
-    RakeFileUtils.verbose_flag = false
-
     gem = Gem::Specification.new do |g|
       g.name = "pkgr"
       g.version = "1.2.3"
@@ -108,8 +95,6 @@ def test_gem_package_with_ruby_platform
   end
 
   def test_package_dir_path
-    RakeFileUtils.verbose_flag = false
-
     gem = Gem::Specification.new do |g|
       g.name = 'nokogiri'
       g.version = '1.5.0'