diff --git a/test/sass/cache_test.rb b/test/sass/cache_test.rb
index 90a8d2d..99d4a45 100755
--- a/test/sass/cache_test.rb
+++ b/test/sass/cache_test.rb
@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/test_helper'
 require 'sass/engine'
 
-class CacheTest < Test::Unit::TestCase
+class CacheTest < MiniTest::Unit::TestCase
   @@cache_dir = "tmp/file_cache"
 
   def setup
diff --git a/test/sass/callbacks_test.rb b/test/sass/callbacks_test.rb
index b0a2081..422959f 100755
--- a/test/sass/callbacks_test.rb
+++ b/test/sass/callbacks_test.rb
@@ -26,7 +26,7 @@ module ClassLevelCallerBack
   end
 end
 
-class SassCallbacksTest < Test::Unit::TestCase
+class SassCallbacksTest < MiniTest::Unit::TestCase
   def test_simple_callback
     cb = CallerBack.new
     there = false
diff --git a/test/sass/compiler_test.rb b/test/sass/compiler_test.rb
index 9c8d1c8..e618f7a 100755
--- a/test/sass/compiler_test.rb
+++ b/test/sass/compiler_test.rb
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
-require 'test/unit'
+require 'minitest/autorun'
 require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/plugin'
 require 'sass/plugin/compiler'
 
-class CompilerTest < Test::Unit::TestCase
+class CompilerTest < MiniTest::Unit::TestCase
   class FakeListener
     attr_accessor :options
     attr_accessor :directories
diff --git a/test/sass/conversion_test.rb b/test/sass/conversion_test.rb
index 3e270b2..18f0eeb 100755
--- a/test/sass/conversion_test.rb
+++ b/test/sass/conversion_test.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
 
-class ConversionTest < Test::Unit::TestCase
+class ConversionTest < MiniTest::Unit::TestCase
   def test_basic
     assert_renders <<SASS, <<SCSS
 foo bar
diff --git a/test/sass/css2sass_test.rb b/test/sass/css2sass_test.rb
index eadba9e..1b77737 100755
--- a/test/sass/css2sass_test.rb
+++ b/test/sass/css2sass_test.rb
@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
-require 'test/unit'
+require 'minitest/autorun'
 require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/css'
 
-class CSS2SassTest < Test::Unit::TestCase
+class CSS2SassTest < MiniTest::Unit::TestCase
   def test_basic
     css = <<CSS
 h1 {
diff --git a/test/sass/engine_test.rb b/test/sass/engine_test.rb
index 236624a..4166b56 100755
--- a/test/sass/engine_test.rb
+++ b/test/sass/engine_test.rb
@@ -26,7 +26,7 @@ module Sass::Script::Functions
   include Sass::Script::Functions::UserFunctions
 end
 
-class SassEngineTest < Test::Unit::TestCase
+class SassEngineTest < MiniTest::Unit::TestCase
   FAKE_FILE_NAME = __FILE__.gsub(/rb$/,"sass")
   # A map of erroneous Sass documents to the error messages they should produce.
   # The error messages may be arrays;
diff --git a/test/sass/exec_test.rb b/test/sass/exec_test.rb
index 1f3e113..8fbeb99 100755
--- a/test/sass/exec_test.rb
+++ b/test/sass/exec_test.rb
@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/util/test'
 require 'tmpdir'
 
-class ExecTest < Test::Unit::TestCase
+class ExecTest < MiniTest::Unit::TestCase
   include Sass::Util::Test
 
   def setup
diff --git a/test/sass/extend_test.rb b/test/sass/extend_test.rb
index 0572eff..80dd1f3 100755
--- a/test/sass/extend_test.rb
+++ b/test/sass/extend_test.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
 
-class ExtendTest < Test::Unit::TestCase
+class ExtendTest < MiniTest::Unit::TestCase
   def test_basic
     assert_equal <<CSS, render(<<SCSS)
 .foo, .bar {
diff --git a/test/sass/functions_test.rb b/test/sass/functions_test.rb
index ef5f20a..5368065 100755
--- a/test/sass/functions_test.rb
+++ b/test/sass/functions_test.rb
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'test/unit'
+require 'minitest/autorun'
 require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/test_helper'
 require 'sass/script'
@@ -45,7 +45,7 @@ module Sass::Script::Functions
   include Sass::Script::Functions::UserFunctions
 end
 
-class SassFunctionTest < Test::Unit::TestCase
+class SassFunctionTest < MiniTest::Unit::TestCase
   # Tests taken from:
   #   http://www.w3.org/Style/CSS/Test/CSS3/Color/20070927/html4/t040204-hsl-h-rotating-b.htm
   #   http://www.w3.org/Style/CSS/Test/CSS3/Color/20070927/html4/t040204-hsl-values-b.htm
diff --git a/test/sass/importer_test.rb b/test/sass/importer_test.rb
index 304efb3..72116bc 100755
--- a/test/sass/importer_test.rb
+++ b/test/sass/importer_test.rb
@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/test_helper'
 require 'mock_importer'
 require 'sass/plugin'
 
-class ImporterTest < Test::Unit::TestCase
+class ImporterTest < MiniTest::Unit::TestCase
 
   class FruitImporter < Sass::Importers::Base
     def find(name, context = nil)
diff --git a/test/sass/logger_test.rb b/test/sass/logger_test.rb
index 7e0811d..fd5ef42 100755
--- a/test/sass/logger_test.rb
+++ b/test/sass/logger_test.rb
@@ -2,7 +2,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'pathname'
 
-class LoggerTest < Test::Unit::TestCase
+class LoggerTest < MiniTest::Unit::TestCase
 
   class InterceptedLogger < Sass::Logger::Base
 
diff --git a/test/sass/plugin_test.rb b/test/sass/plugin_test.rb
index 749bb1c..7708aad 100755
--- a/test/sass/plugin_test.rb
+++ b/test/sass/plugin_test.rb
@@ -17,7 +17,7 @@ module Sass::Script::Functions
   end
 end
 
-class SassPluginTest < Test::Unit::TestCase
+class SassPluginTest < MiniTest::Unit::TestCase
   @@templates = %w{
     complex script parent_ref import scss_import alt
     subdir/subdir subdir/nested_subdir/nested_subdir
diff --git a/test/sass/script_conversion_test.rb b/test/sass/script_conversion_test.rb
index a180009..380117e 100755
--- a/test/sass/script_conversion_test.rb
+++ b/test/sass/script_conversion_test.rb
@@ -3,7 +3,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'sass/engine'
 
-class SassScriptConversionTest < Test::Unit::TestCase
+class SassScriptConversionTest < MiniTest::Unit::TestCase
   def test_bool
     assert_renders "true"
     assert_renders "false"
diff --git a/test/sass/script_test.rb b/test/sass/script_test.rb
index 97c7ca9..e2916f4 100755
--- a/test/sass/script_test.rb
+++ b/test/sass/script_test.rb
@@ -17,7 +17,7 @@ module Sass::Script::Functions
   include Sass::Script::Functions::UserFunctions
 end
 
-class SassScriptTest < Test::Unit::TestCase
+class SassScriptTest < MiniTest::Unit::TestCase
   include Sass::Script
 
   def test_color_checks_input
diff --git a/test/sass/scss/css_test.rb b/test/sass/scss/css_test.rb
index b9a6d69..59ee262 100755
--- a/test/sass/scss/css_test.rb
+++ b/test/sass/scss/css_test.rb
@@ -6,7 +6,7 @@ require 'sass/scss/css_parser'
 # These tests just test the parsing of CSS
 # (both standard and any hacks we intend to support).
 # Tests of SCSS-specific behavior go in scss_test.rb.
-class ScssCssTest < Test::Unit::TestCase
+class ScssCssTest < MiniTest::Unit::TestCase
   include ScssTestHelper
 
   def test_basic_scss
diff --git a/test/sass/scss/rx_test.rb b/test/sass/scss/rx_test.rb
index e5cb59a..42411a0 100755
--- a/test/sass/scss/rx_test.rb
+++ b/test/sass/scss/rx_test.rb
@@ -3,7 +3,7 @@
 require File.dirname(__FILE__) + '/../../test_helper'
 require 'sass/engine'
 
-class ScssRxTest < Test::Unit::TestCase
+class ScssRxTest < MiniTest::Unit::TestCase
   include Sass::SCSS::RX
 
   def test_identifiers
diff --git a/test/sass/scss/scss_test.rb b/test/sass/scss/scss_test.rb
index 45b1ba9..1f3ae27 100755
--- a/test/sass/scss/scss_test.rb
+++ b/test/sass/scss/scss_test.rb
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/test_helper'
 
-class ScssTest < Test::Unit::TestCase
+class ScssTest < MiniTest::Unit::TestCase
   include ScssTestHelper
 
   ## One-Line Comments
diff --git a/test/sass/source_map_test.rb b/test/sass/source_map_test.rb
index 5248d91..910a1f9 100755
--- a/test/sass/source_map_test.rb
+++ b/test/sass/source_map_test.rb
@@ -3,7 +3,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require File.dirname(__FILE__) + '/test_helper'
 
-class SourcemapTest < Test::Unit::TestCase
+class SourcemapTest < MiniTest::Unit::TestCase
   def test_to_json_requires_args
     _, sourcemap = render_with_sourcemap('')
     assert_raise(ArgumentError) {sourcemap.to_json({})}
diff --git a/test/sass/test_helper.rb b/test/sass/test_helper.rb
index 919806e..45fbfe0 100644
--- a/test/sass/test_helper.rb
+++ b/test/sass/test_helper.rb
@@ -1,7 +1,7 @@
 test_dir = File.dirname(__FILE__)
 $:.unshift test_dir unless $:.include?(test_dir)
 
-class Test::Unit::TestCase
+class MiniTest::Unit::TestCase
   def absolutize(file)
     File.expand_path("#{File.dirname(__FILE__)}/#{file}")
   end
diff --git a/test/sass/util/multibyte_string_scanner_test.rb b/test/sass/util/multibyte_string_scanner_test.rb
index bc0db14..f0a7b80 100755
--- a/test/sass/util/multibyte_string_scanner_test.rb
+++ b/test/sass/util/multibyte_string_scanner_test.rb
@@ -3,7 +3,7 @@
 require File.dirname(__FILE__) + '/../../test_helper'
 
 unless Sass::Util.ruby1_8?
-  class MultibyteStringScannerTest < Test::Unit::TestCase
+  class MultibyteStringScannerTest < MiniTest::Unit::TestCase
     def setup
       @scanner = Sass::Util::MultibyteStringScanner.new("cölorfül")
     end
diff --git a/test/sass/util/normalized_map_test.rb b/test/sass/util/normalized_map_test.rb
index aa16113..c3ded26 100755
--- a/test/sass/util/normalized_map_test.rb
+++ b/test/sass/util/normalized_map_test.rb
@@ -2,7 +2,7 @@
 require File.dirname(__FILE__) + '/../../test_helper'
 require 'sass/util/normalized_map'
 
-class NormalizedMapTest < Test::Unit::TestCase
+class NormalizedMapTest < MiniTest::Unit::TestCase
   extend PublicApiLinter
 
   lint_api Hash, Sass::Util::NormalizedMap
diff --git a/test/sass/util/subset_map_test.rb b/test/sass/util/subset_map_test.rb
index b595394..1a5b294 100755
--- a/test/sass/util/subset_map_test.rb
+++ b/test/sass/util/subset_map_test.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../../test_helper'
 
-class SubsetMapTest < Test::Unit::TestCase
+class SubsetMapTest < MiniTest::Unit::TestCase
   def setup
     @ssm = Sass::Util::SubsetMap.new
     @ssm[Set[1, 2]] = "Foo"
diff --git a/test/sass/util_test.rb b/test/sass/util_test.rb
index 5a33c53..17113e2 100755
--- a/test/sass/util_test.rb
+++ b/test/sass/util_test.rb
@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 require 'pathname'
 require 'tmpdir'
 
-class UtilTest < Test::Unit::TestCase
+class UtilTest < MiniTest::Unit::TestCase
   include Sass::Util
 
   def test_scope
diff --git a/test/sass/value_helpers_test.rb b/test/sass/value_helpers_test.rb
index 1141b8f..dfd9f07 100755
--- a/test/sass/value_helpers_test.rb
+++ b/test/sass/value_helpers_test.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require File.dirname(__FILE__) + '/../test_helper'
 
-class ValueHelpersTest < Test::Unit::TestCase
+class ValueHelpersTest < MiniTest::Unit::TestCase
   include Sass::Script
   include Sass::Script::Value::Helpers
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 31d3f84..70583b1 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,6 +1,6 @@
 lib_dir = File.dirname(__FILE__) + '/../lib'
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'fileutils'
 $:.unshift lib_dir unless $:.include?(lib_dir)
 require 'sass'
@@ -22,7 +22,7 @@ module Sass::Script::Functions
   end
 end
 
-class Test::Unit::TestCase
+class MiniTest::Unit::TestCase
   def munge_filename(opts = {})
     opts[:filename] ||= filename_for_test(opts[:syntax] || :sass)
     opts[:sourcemap_filename] ||= sourcemap_filename_for_test
-- 
1.8.3.1