diff --git a/test/sass/cache_test.rb b/test/sass/cache_test.rb

index 90a8d2d..87e7c1d 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::Test

   @@cache_dir = "tmp/file_cache"

   def setup

diff --git a/test/sass/callbacks_test.rb b/test/sass/callbacks_test.rb

index b0a2081..6573a04 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::Test

   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..b96e5b1 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::Test

   class FakeListener

     attr_accessor :options

     attr_accessor :directories

diff --git a/test/sass/conversion_test.rb b/test/sass/conversion_test.rb

index 3e270b2..3f741af 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::Test

   def test_basic

     assert_renders <

 foo bar

@@ -1367,7 +1367,7 @@ SCSS

   end

   def test_disallowed_colon_hack

-    assert_raise_message(Sass::SyntaxError, 'The ":name: val" hack is not allowed in the Sass indented syntax') do

+    assert_raises_message(Sass::SyntaxError, 'The ":name: val" hack is not allowed in the Sass indented syntax') do

       to_sass("foo {:name: val;}", :syntax => :scss)

     end

   end

diff --git a/test/sass/css2sass_test.rb b/test/sass/css2sass_test.rb

index eadba9e..b443578 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::Test

   def test_basic

     css = <

 h1 {

diff --git a/test/sass/engine_test.rb b/test/sass/engine_test.rb

index 236624a..b7ec217 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::Test

   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;

@@ -232,7 +232,7 @@ MSG

   end

   def test_import_same_name_different_ext

-    assert_raise_message Sass::SyntaxError, <

+    assert_raises_message Sass::SyntaxError, <

 It's not clear which file to import for '@import "same_name_different_ext"'.

 Candidates:

   same_name_different_ext.sass

@@ -246,7 +246,7 @@ ERROR

   end

   def test_import_same_name_different_partiality

-    assert_raise_message Sass::SyntaxError, <

+    assert_raises_message Sass::SyntaxError, <

 It's not clear which file to import for '@import "same_name_different_partiality"'.

 Candidates:

   _same_name_different_partiality.scss

@@ -496,7 +496,7 @@ SASS

     engine = Sass::Engine.new('@import "foo"', :filename => filename_for_test,

       :load_paths => [importer], :importer => importer)

-    assert_raise_message(Sass::SyntaxError, <

+    assert_raises_message(Sass::SyntaxError, <

 An @import loop has been found:

     #{filename_for_test} imports foo

     foo imports bar

@@ -513,7 +513,7 @@ ERR

     engine = Sass::Engine.new('@import "foo"', :filename => filename_for_test,

       :load_paths => [importer], :importer => importer)

-    assert_raise_message(Sass::SyntaxError, <

+    assert_raises_message(Sass::SyntaxError, <

 An @import loop has been found:

     #{filename_for_test} imports foo

     foo imports bar

@@ -673,7 +673,7 @@ SASS

   end

   def test_nonexistent_import

-    assert_raise_message(Sass::SyntaxError, <

+    assert_raises_message(Sass::SyntaxError, <

 File to import not found or unreadable: nonexistent.sass.

 Load path: #{Dir.pwd}

 ERR

@@ -682,7 +682,7 @@ ERR

   end

   def test_nonexistent_extensionless_import

-    assert_raise_message(Sass::SyntaxError, <

+    assert_raises_message(Sass::SyntaxError, <

 File to import not found or unreadable: nonexistent.

 Load path: #{Dir.pwd}

 ERR

@@ -1684,7 +1684,7 @@ SASS

   end

   def test_argument_error

-    assert_raise(Sass::SyntaxError) { render("a\n  b: hsl(1)") }

+    assert_raises(Sass::SyntaxError) { render("a\n  b: hsl(1)") }

   end

   def test_comments_at_the_top_of_a_document

@@ -2704,7 +2704,7 @@ SASS

   end

   def test_mixin_no_arg_error

-    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "($bar,": expected variable (e.g. $foo), was ")"') do

+    assert_raises_message(Sass::SyntaxError, 'Invalid CSS after "($bar,": expected variable (e.g. $foo), was ")"') do

       render(<

 =foo($bar,)

   bip: bap

@@ -2876,7 +2876,7 @@ SASS

   end

   def test_comment_like_selector

-    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "/": expected identifier, was " foo"') {render(<

+    assert_raises_message(Sass::SyntaxError, 'Invalid CSS after "/": expected identifier, was " foo"') {render(<

 / foo

   a: b

 SASS

diff --git a/test/sass/exec_test.rb b/test/sass/exec_test.rb

index 1f3e113..e1550f4 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::Test

   include Sass::Util::Test

   def setup

diff --git a/test/sass/extend_test.rb b/test/sass/extend_test.rb

index 0572eff..5891790 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::Test

   def test_basic

     assert_equal <

 .foo, .bar {

@@ -516,7 +516,7 @@ SCSS

   end

   def test_nested_extender_with_trailing_child_selector

-    assert_raise(Sass::SyntaxError, "bar > can't extend: invalid selector") do

+    assert_raises(Sass::SyntaxError, "bar > can't extend: invalid selector") do

       render("bar > {@extend .baz}")

     end

   end

@@ -841,7 +841,7 @@ SCSS

   end

   def test_extend_out_of_media

-    assert_raise_message(Sass::SyntaxError, <

+    assert_raises_message(Sass::SyntaxError, <

 You may not @extend an outer selector from within @media.

 You may only @extend selectors within the same directive.

 From "@extend .foo" on line 3 of test_extend_out_of_media_inline.scss.

@@ -854,7 +854,7 @@ SCSS

   end

   def test_extend_out_of_unknown_directive

-    assert_raise_message(Sass::SyntaxError, <

+    assert_raises_message(Sass::SyntaxError, <

 You may not @extend an outer selector from within @flooblehoof.

 You may only @extend selectors within the same directive.

 From "@extend .foo" on line 3 of test_extend_out_of_unknown_directive_inline.scss.

@@ -867,7 +867,7 @@ SCSS

   end

   def test_extend_out_of_nested_directives

-    assert_raise_message(Sass::SyntaxError, <

+    assert_raises_message(Sass::SyntaxError, <

 You may not @extend an outer selector from within @flooblehoof.

 You may only @extend selectors within the same directive.

 From "@extend .foo" on line 4 of test_extend_out_of_nested_directives_inline.scss.

@@ -961,7 +961,7 @@ SCSS

   end

   def test_extend_within_and_without_media

-    assert_raise_message(Sass::SyntaxError, <

+    assert_raises_message(Sass::SyntaxError, <

 You may not @extend an outer selector from within @media.

 You may only @extend selectors within the same directive.

 From "@extend .foo" on line 4 of test_extend_within_and_without_media_inline.scss.

@@ -975,7 +975,7 @@ SCSS

   end

   def test_extend_within_and_without_unknown_directive

-    assert_raise_message(Sass::SyntaxError, <

+    assert_raises_message(Sass::SyntaxError, <

 You may not @extend an outer selector from within @flooblehoof.

 You may only @extend selectors within the same directive.

 From "@extend .foo" on line 4 of test_extend_within_and_without_unknown_directive_inline.scss.

@@ -989,7 +989,7 @@ SCSS

   end

   def test_extend_within_and_without_nested_directives

-    assert_raise_message(Sass::SyntaxError, <

+    assert_raises_message(Sass::SyntaxError, <

 You may not @extend an outer selector from within @flooblehoof.

 You may only @extend selectors within the same directive.

 From "@extend .foo" on line 5 of test_extend_within_and_without_nested_directives_inline.scss.

@@ -1063,7 +1063,7 @@ SCSS

   end

   def test_extend_warns_when_extendee_doesnt_exist

-    assert_raise_message(Sass::SyntaxError, <

+    assert_raises_message(Sass::SyntaxError, <

 ".foo" failed to @extend ".bar".

 The selector ".bar" was not found.

 Use "@extend .bar !optional" if the extend should be able to fail.

@@ -1073,7 +1073,7 @@ SCSS

   end

   def test_extend_warns_when_extension_fails

-    assert_raise_message(Sass::SyntaxError, <

+    assert_raises_message(Sass::SyntaxError, <

 "b.foo" failed to @extend ".bar".

 No selectors matching ".bar" could be unified with "b.foo".

 Use "@extend .bar !optional" if the extend should be able to fail.

@@ -1401,7 +1401,7 @@ SCSS

         "No selectors matching \"#{target}\" could be unified with \"#{extender}\"."

       end

-    assert_raise_message(Sass::SyntaxError, <

+    assert_raises_message(Sass::SyntaxError, <

 #{message}

 #{reason}

 Use "@extend #{target} !optional" if the extend should be able to fail.

diff --git a/test/sass/functions_test.rb b/test/sass/functions_test.rb

index ef5f20a..173d5e5 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::Test

   # 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..4b1283a 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::Test

   class FruitImporter < Sass::Importers::Base

     def find(name, context = nil)

@@ -372,7 +372,7 @@ JSON

   def test_render_with_sourcemap_requires_filename

     file_system_importer = Sass::Importers::Filesystem.new('.')

     engine = Sass::Engine.new(".foo {a: b}", :syntax => :scss, :importer => file_system_importer)

-    assert_raise_message(Sass::SyntaxError, <

+    assert_raises_message(Sass::SyntaxError, <

 Error generating source map: couldn't determine public URL for the source stylesheet.

   No filename is available so there's nothing for the source map to link to.

 MESSAGE

@@ -380,7 +380,7 @@ MESSAGE

   def test_render_with_sourcemap_requires_importer_with_public_url

     class_importer = ClassImporter.new({"pear" => "color: green;"}, {"pear" => Time.now})

-    assert_raise_message(Sass::SyntaxError, <

+    assert_raises_message(Sass::SyntaxError, <

 Error generating source map: couldn't determine public URL for "pear".

   Without a public URL, there's nothing for the source map to link to.

   Custom importers should define the #public_url method.

diff --git a/test/sass/logger_test.rb b/test/sass/logger_test.rb

index 7e0811d..e9779e1 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::Test

   class InterceptedLogger < Sass::Logger::Base

diff --git a/test/sass/plugin_test.rb b/test/sass/plugin_test.rb

index 749bb1c..817f43e 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::Test

   @@templates = %w{

     complex script parent_ref import scss_import alt

     subdir/subdir subdir/nested_subdir/nested_subdir

@@ -183,7 +183,7 @@ CSS

     Sass::Plugin.options[:full_exception] = false

     File.delete(tempfile_loc('bork1'))

-    assert_raise(Sass::SyntaxError) {check_for_updates!}

+    assert_raises(Sass::SyntaxError) {check_for_updates!}

   ensure

     Sass::Plugin.options[:full_exception] = old_full_exception

   end

diff --git a/test/sass/script_conversion_test.rb b/test/sass/script_conversion_test.rb

index a180009..930d916 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::Test

   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..8525885 100755

--- a/test/sass/script_test.rb

+++ b/test/sass/script_test.rb

@@ -17,17 +17,17 @@ module Sass::Script::Functions

   include Sass::Script::Functions::UserFunctions

 end

-class SassScriptTest < Test::Unit::TestCase

+class SassScriptTest < Minitest::Test

   include Sass::Script

   def test_color_checks_input

-    assert_raise_message(ArgumentError, "Blue value -1 must be between 0 and 255") {Sass::Script::Value::Color.new([1, 2, -1])}

-    assert_raise_message(ArgumentError, "Red value 256 must be between 0 and 255") {Sass::Script::Value::Color.new([256, 2, 3])}

+    assert_raises_message(ArgumentError, "Blue value -1 must be between 0 and 255") {Sass::Script::Value::Color.new([1, 2, -1])}

+    assert_raises_message(ArgumentError, "Red value 256 must be between 0 and 255") {Sass::Script::Value::Color.new([256, 2, 3])}

   end

   def test_color_checks_rgba_input

-    assert_raise_message(ArgumentError, "Alpha channel 1.1 must be between 0 and 1") {Sass::Script::Value::Color.new([1, 2, 3, 1.1])}

-    assert_raise_message(ArgumentError, "Alpha channel -0.1 must be between 0 and 1") {Sass::Script::Value::Color.new([1, 2, 3, -0.1])}

+    assert_raises_message(ArgumentError, "Alpha channel 1.1 must be between 0 and 1") {Sass::Script::Value::Color.new([1, 2, 3, 1.1])}

+    assert_raises_message(ArgumentError, "Alpha channel -0.1 must be between 0 and 1") {Sass::Script::Value::Color.new([1, 2, 3, -0.1])}

   end

   def test_string_escapes

@@ -67,13 +67,13 @@ class SassScriptTest < Test::Unit::TestCase

     assert_equal "rgba(50, 50, 100, 0.35)", resolve("rgba(1, 1, 2, 0.35) * rgba(50, 50, 50, 0.35)")

     assert_equal "rgba(52, 52, 52, 0.25)", resolve("rgba(2, 2, 2, 0.25) + rgba(50, 50, 50, 0.25)")

-    assert_raise_message(Sass::SyntaxError, "Alpha channels must be equal: rgba(1, 2, 3, 0.15) + rgba(50, 50, 50, 0.75)") do

+    assert_raises_message(Sass::SyntaxError, "Alpha channels must be equal: rgba(1, 2, 3, 0.15) + rgba(50, 50, 50, 0.75)") do

       resolve("rgba(1, 2, 3, 0.15) + rgba(50, 50, 50, 0.75)")

     end

-    assert_raise_message(Sass::SyntaxError, "Alpha channels must be equal: #123456 * rgba(50, 50, 50, 0.75)") do

+    assert_raises_message(Sass::SyntaxError, "Alpha channels must be equal: #123456 * rgba(50, 50, 50, 0.75)") do

       resolve("#123456 * rgba(50, 50, 50, 0.75)")

     end

-    assert_raise_message(Sass::SyntaxError, "Alpha channels must be equal: rgba(50, 50, 50, 0.75) / #123456") do

+    assert_raises_message(Sass::SyntaxError, "Alpha channels must be equal: rgba(50, 50, 50, 0.75) / #123456") do

       resolve("rgba(50, 50, 50, 0.75) / #123456")

     end

   end

@@ -344,33 +344,33 @@ SASS

   end

   def test_null_ops

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       'Invalid null operation: "null plus 1".') {eval("null + 1")}

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       'Invalid null operation: "null minus 1".') {eval("null - 1")}

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       'Invalid null operation: "null times 1".') {eval("null * 1")}

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       'Invalid null operation: "null div 1".') {eval("null / 1")}

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       'Invalid null operation: "null mod 1".') {eval("null % 1")}

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       'Invalid null operation: "1 plus null".') {eval("1 + null")}

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       'Invalid null operation: "1 minus null".') {eval("1 - null")}

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       'Invalid null operation: "1 times null".') {eval("1 * null")}

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       'Invalid null operation: "1 div null".') {eval("1 / null")}

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       'Invalid null operation: "1 mod null".') {eval("1 % null")}

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       'Invalid null operation: "1 gt null".') {eval("1 > null")}

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       'Invalid null operation: "null lt 1".') {eval("null < 1")}

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       'Invalid null operation: "null plus null".') {eval("null + null")}

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       'Invalid null operation: ""foo" plus null".') {eval("foo + null")}

   end

@@ -463,15 +463,15 @@ SASS

   end

   def test_colors_with_wrong_number_of_digits

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       "Colors must have either three or six digits: '#0'") {eval("#0")}

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       "Colors must have either three or six digits: '#12'") {eval("#12")}

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       "Colors must have either three or six digits: '#abcd'") {eval("#abcd")}

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       "Colors must have either three or six digits: '#abcdE'") {eval("#abcdE")}

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       "Colors must have either three or six digits: '#abcdEFA'") {eval("#abcdEFA")}

   end

@@ -485,8 +485,8 @@ SASS

     assert_equal "1 2 3", resolve("1 2 () 3")

     assert_equal "1 2 3", resolve("1 2 3 ()")

     assert_equal "1 2 3", resolve("() 1 2 3")

-    assert_raise_message(Sass::SyntaxError, "() isn't a valid CSS value.") {resolve("()")}

-    assert_raise_message(Sass::SyntaxError, "() isn't a valid CSS value.") {resolve("nth(append((), ()), 1)")}

+    assert_raises_message(Sass::SyntaxError, "() isn't a valid CSS value.") {resolve("()")}

+    assert_raises_message(Sass::SyntaxError, "() isn't a valid CSS value.") {resolve("nth(append((), ()), 1)")}

   end

   def test_list_with_nulls

@@ -511,19 +511,19 @@ SASS

   end

   def test_map_cannot_have_duplicate_keys

-    assert_raise_message(Sass::SyntaxError, 'Duplicate key "foo" in map (foo: bar, foo: baz).') do

+    assert_raises_message(Sass::SyntaxError, 'Duplicate key "foo" in map (foo: bar, foo: baz).') do

       eval("(foo: bar, foo: baz)")

     end

-    assert_raise_message(Sass::SyntaxError, 'Duplicate key "foo" in map (foo: bar, fo + o: baz).') do

+    assert_raises_message(Sass::SyntaxError, 'Duplicate key "foo" in map (foo: bar, fo + o: baz).') do

       eval("(foo: bar, fo + o: baz)")

     end

-    assert_raise_message(Sass::SyntaxError, 'Duplicate key "foo" in map (foo: bar, "foo": baz).') do

+    assert_raises_message(Sass::SyntaxError, 'Duplicate key "foo" in map (foo: bar, "foo": baz).') do

       eval("(foo: bar, 'foo': baz)")

     end

-    assert_raise_message(Sass::SyntaxError, 'Duplicate key 2px in map (2px: bar, 1px + 1px: baz).') do

+    assert_raises_message(Sass::SyntaxError, 'Duplicate key 2px in map (2px: bar, 1px + 1px: baz).') do

       eval("(2px: bar, 1px + 1px: baz)")

     end

-    assert_raise_message(Sass::SyntaxError, 'Duplicate key #0000ff in map (blue: bar, blue: baz).') do

+    assert_raises_message(Sass::SyntaxError, 'Duplicate key #0000ff in map (blue: bar, blue: baz).') do

       eval("(blue: bar, #00f: baz)")

     end

   end

@@ -537,16 +537,16 @@ SASS

   end

   def test_map_syntax_errors

-    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "(foo:": expected expression (e.g. 1px, bold), was ")"') do

+    assert_raises_message(Sass::SyntaxError, 'Invalid CSS after "(foo:": expected expression (e.g. 1px, bold), was ")"') do

       eval("(foo:)")

     end

-    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "(": expected ")", was ":bar)"') do

+    assert_raises_message(Sass::SyntaxError, 'Invalid CSS after "(": expected ")", was ":bar)"') do

       eval("(:bar)")

     end

-    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "(foo, bar": expected ")", was ": baz)"') do

+    assert_raises_message(Sass::SyntaxError, 'Invalid CSS after "(foo, bar": expected ")", was ": baz)"') do

       eval("(foo, bar: baz)")

     end

-    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "(foo: bar, baz": expected ":", was ")"') do

+    assert_raises_message(Sass::SyntaxError, 'Invalid CSS after "(foo: bar, baz": expected ":", was ")"') do

       eval("(foo: bar, baz)")

     end

   end

@@ -558,11 +558,11 @@ SASS

     return if RUBY_PLATFORM =~ /java/

     # Don't validate the message; it's different on Rubinius.

-    assert_raise(ArgumentError) {resolve("arg-error()")}

+    assert_raises(ArgumentError) {resolve("arg-error()")}

   end

   def test_shallow_argument_error_unwrapped

-    assert_raise_message(Sass::SyntaxError, "wrong number of arguments (1 for 0) for `arg-error'") {resolve("arg-error(1)")}

+    assert_raises_message(Sass::SyntaxError, "wrong number of arguments (1 for 0) for `arg-error'") {resolve("arg-error(1)")}

   end

   def test_boolean_ops_short_circuit

@@ -746,7 +746,7 @@ end

   end

   def test_misplaced_comma_in_funcall

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       'Invalid CSS after "foo(bar, ": expected function argument, was ")"') {eval('foo(bar, )')}

   end

diff --git a/test/sass/scss/css_test.rb b/test/sass/scss/css_test.rb

index b9a6d69..cb15edc 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::Test

   include ScssTestHelper

   def test_basic_scss

@@ -1030,7 +1030,7 @@ SCSS

   end

   def test_long_unclosed_comment_doesnt_take_forever

-    assert_raise_message(Sass::SyntaxError,

+    assert_raises_message(Sass::SyntaxError,

       'Invalid CSS after "/*": expected "/", was "//*************..."') {render(<

 /*

 //**************************************************************************

diff --git a/test/sass/scss/rx_test.rb b/test/sass/scss/rx_test.rb

index e5cb59a..d5390e6 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::Test

   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..cf4fad8 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::Test

   include ScssTestHelper

   ## One-Line Comments

@@ -1342,7 +1342,7 @@ SCSS

   end

   def test_mixin_conflicting_splat_after_keyword_args

-    assert_raise_message(Sass::SyntaxError, <

+    assert_raises_message(Sass::SyntaxError, <

 Mixin foo was passed argument $b both by position and by name.

 MESSAGE

 @mixin foo($a, $b, $c) {

@@ -1358,7 +1358,7 @@ SCSS

   end

   def test_mixin_keyword_splat_must_have_string_keys

-    assert_raise_message(Sass::SyntaxError, <

+    assert_raises_message(Sass::SyntaxError, <

 Variable keyword argument map must have string keys.

 12 is not a string in (12: 1).

 MESSAGE

@@ -1371,7 +1371,7 @@ SCSS

   end

   def test_mixin_positional_arg_after_splat

-    assert_raise_message(Sass::SyntaxError, <

+    assert_raises_message(Sass::SyntaxError, <

 Only keyword arguments may follow variable arguments (...).

 MESSAGE

 @mixin foo($a, $b, $c) {

@@ -1387,7 +1387,7 @@ SCSS

   end

   def test_mixin_var_args_with_keyword

-    assert_raise_message(Sass::SyntaxError, "Positional arguments must come before keyword arguments.") {render <

+    assert_raises_message(Sass::SyntaxError, "Positional arguments must come before keyword arguments.") {render <

 @mixin foo($a, $b...) {

   a: $a;

   b: $b;

@@ -1398,7 +1398,7 @@ SCSS

   end

   def test_mixin_keyword_for_var_arg

-    assert_raise_message(Sass::SyntaxError, "Argument $b of mixin foo cannot be used as a named argument.") {render <

+    assert_raises_message(Sass::SyntaxError, "Argument $b of mixin foo cannot be used as a named argument.") {render <

 @mixin foo($a, $b...) {

   a: $a;

   b: $b;

@@ -1409,7 +1409,7 @@ SCSS

   end

   def test_mixin_keyword_for_unknown_arg_with_var_args

-    assert_raise_message(Sass::SyntaxError, "Mixin foo doesn't have an argument named $c.") {render <

+    assert_raises_message(Sass::SyntaxError, "Mixin foo doesn't have an argument named $c.") {render <

 @mixin foo($a, $b...) {

   a: $a;

   b: $b;

@@ -1420,7 +1420,7 @@ SCSS

   end

   def test_mixin_map_splat_before_list_splat

-    assert_raise_message(Sass::SyntaxError, "Variable keyword arguments must be a map (was (2 3)).") {render <

+    assert_raises_message(Sass::SyntaxError, "Variable keyword arguments must be a map (was (2 3)).") {render <

 @mixin foo($a, $b, $c) {

   a: $a;

   b: $b;

@@ -1434,7 +1434,7 @@ SCSS

   end

   def test_mixin_map_splat_with_unknown_keyword

-    assert_raise_message(Sass::SyntaxError, "Mixin foo doesn't have an argument named $c.") {render <

+    assert_raises_message(Sass::SyntaxError, "Mixin foo doesn't have an argument named $c.") {render <

 @mixin foo($a, $b) {

   a: $a;

   b: $b;

@@ -1447,7 +1447,7 @@ SCSS

   end

   def test_mixin_map_splat_with_wrong_type

-    assert_raise_message(Sass::SyntaxError, "Variable keyword arguments must be a map (was 12).") {render <

+    assert_raises_message(Sass::SyntaxError, "Variable keyword arguments must be a map (was 12).") {render <

 @mixin foo($a, $b) {

   a: $a;

   b: $b;

@@ -1761,7 +1761,7 @@ SCSS

   end

   def test_function_conflicting_splat_after_keyword_args

-    assert_raise_message(Sass::SyntaxError, <

+    assert_raises_message(Sass::SyntaxError, <

 Function foo was passed argument $b both by position and by name.

 MESSAGE