diff --git a/devel/levitate.rb b/devel/levitate.rb
index 38712df..e425fcf 100644
--- a/devel/levitate.rb
+++ b/devel/levitate.rb
@@ -1,5 +1,7 @@
 
 class Levitate
+  include Rake::DSL
+
   def initialize(gem_name)
     @gem_name = gem_name
 
@@ -336,7 +338,13 @@ def define_test
         test_files.each { |file| require file }
 
         # if we use at_exit hook instead, it won't run before :release
-        MiniTest::Unit.new.run ARGV
+        if MiniTest::Unit.method_defined? :run
+          # minitest 4
+          MiniTest::Unit.new.run ARGV
+        else
+          # minitest 5
+          Minitest.run ARGV
+        end
       end
       
       desc "run tests with coverage"
diff --git a/test/comp_tree_test_base.rb b/test/comp_tree_test_base.rb
index 2affe6f..55a0fa9 100644
--- a/test/comp_tree_test_base.rb
+++ b/test/comp_tree_test_base.rb
@@ -1,6 +1,7 @@
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../devel'
 
+gem 'minitest'
 require 'minitest/unit'
 require 'minitest/autorun' unless defined? Rake
 require 'comp_tree'
diff --git a/test/exception_test.rb b/test/exception_test.rb
index ccc73a5..5d30bd1 100644
--- a/test/exception_test.rb
+++ b/test/exception_test.rb
@@ -47,9 +47,9 @@ def test_exception
           )
     
           if define_all
-            assert_block { error.is_a? test_error }
+            assert ( error.is_a? test_error )
           else
-            assert_block { error.is_a? CompTree::NoFunctionError }
+            assert ( error.is_a? CompTree::NoFunctionError )
             assert_equal(
               "no function was defined for node `:border'",
               error.message
diff --git a/test/throw_test.rb b/test/throw_test.rb
index e8192f7..c6198ec 100644
--- a/test/throw_test.rb
+++ b/test/throw_test.rb
@@ -4,7 +4,7 @@ class ThrowTest < CompTreeTest
   EXPECTED = RUBY_VERSION >= "1.9.0" ? ArgumentError : ThreadError
 
   def test_throw
-    assert_equal 1, Thread.list.size
+    init_size = Thread.list.size
     exception = assert_raises(EXPECTED) {
       CompTree.build do |driver|
         driver.define(:root, :a) {
@@ -17,6 +17,6 @@ def test_throw
       end
     }
     assert_match "uncaught", exception.message
-    assert_equal 1, Thread.list.size
+    assert_equal init_size, Thread.list.size
   end
 end