diff --git a/Rakefile b/Rakefile
index 956411844..2bafa4447 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,5 @@
 require 'bundler/setup'
+require 'rake/testtask'
 require 'date'
 require 'rubygems'
 require 'rubygems/package_task'
@@ -47,10 +48,11 @@ end
 
 GEM_NAME = "#{name}"
 task :default => :test
-task :travis  => ['test:travis', 'coveralls_push_workaround']
+task :travis  => ['test', 'test:travis', 'coveralls_push_workaround']
 
-require "tasks/test_task"
-Fog::Rake::TestTask.new
+Rake::TestTask.new do |t|
+  t.pattern = "test/**/*_test.rb"
+end
 
 namespace :test do
   mock = 'true' || ENV['FOG_MOCK']
diff --git a/fog.gemspec b/fog.gemspec
index 6e52919b0..1762e1ce5 100644
--- a/fog.gemspec
+++ b/fog.gemspec
@@ -54,6 +54,7 @@ Gem::Specification.new do |s|
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
+  s.add_development_dependency('minitest')
   s.add_development_dependency('jekyll') unless RUBY_PLATFORM == 'java'
   s.add_development_dependency('rake')
   s.add_development_dependency('rbvmomi')
diff --git a/lib/tasks/test_task.rb b/lib/tasks/test_task.rb
deleted file mode 100644
index c72952ea0..000000000
--- a/lib/tasks/test_task.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require "rake"
-require "rake/tasklib"
-
-module Fog
-  module Rake
-    class TestTask < ::Rake::TaskLib
-
-      def initialize
-        desc "Run the mocked tests"
-        task :test do
-          ::Rake::Task[:mock_tests].invoke
-        end
-
-        task :mock_tests do
-          tests(true)
-        end
-
-        task :real_tests do
-          tests(false)
-        end
-      end
-
-      def tests(mocked)
-        Formatador.display_line
-        start = Time.now.to_i
-        threads = []
-        Thread.main[:results] = []
-        Fog.providers.each do |key, value|
-          threads << Thread.new do
-            Thread.main[:results] << {
-              :provider => value,
-              :success  => sh("export FOG_MOCK=#{mocked} && bundle exec shindont +#{key}")
-            }
-          end
-        end
-        threads.each do |thread|
-          thread.join
-        end
-        Formatador.display_table(Thread.main[:results].sort {|x,y| x[:provider] <=> y[:provider]})
-        Formatador.display_line("[bold]FOG_MOCK=#{mocked}[/] tests completed in [bold]#{Time.now.to_i - start}[/] seconds")
-        Formatador.display_line
-      end
-
-    end
-  end
-end
diff --git a/test/hello_world_test.rb b/test/hello_world_test.rb
new file mode 100644
index 000000000..1a8b8fe9d
--- /dev/null
+++ b/test/hello_world_test.rb
@@ -0,0 +1,8 @@
+require "minitest/autorun"
+
+class HelloWorldTest < Minitest::Test
+  # This is a placeholder to ensure minitest is being picked up by rake
+  def test_truth
+    assert true
+  end
+end