Merge branch 'master' into resource_routes

2 files changed, 2 insertions, 2 deletions

diff --git a/test/ext/capture_output.rb b/test/ext/capture_output.rb
index bbf5424..930f408 100644
--- a/test/ext/capture_output.rb
+++ b/test/ext/capture_output.rb
@@ -20,7 +20,7 @@ module CaptureOutput
     @stdout.string
   end
 end
-class MiniTest::Unit::TestCase
+class MiniTest::Test
   include CaptureOutput
 end
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 47d3517..f091451 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -27,7 +27,7 @@ require 'fakeweb'
 # require test extensions/helpers
 Dir[File.dirname(__FILE__) + '/ext/*.rb'].each { |ext| require ext }
 
-class HCl::TestCase < MiniTest::Unit::TestCase
+class HCl::TestCase < MiniTest::Test
   def setup
     FakeWeb.allow_net_connect = false
     HCl::Net.configure \