diff --git a/Makefile b/Makefile
deleted file mode 100644
index 9fda3b6..0000000
--- a/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-.PHONY : test test-coverage
-
-test :
-	testrb `find tests -name '*.rb'`
-
-test-coverage :
-	rcov -x '\/.rvm\/' -x '\/tests\/data\/' `find tests -name '*.rb'`
-	sed 's#<td class="left_align"><a href="<script>.html"><script></a></td>#<td></td>#' coverage/index.html > coverage/index.html.new
-	mv coverage/index.html.new coverage/index.html
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 0000000..a06c563
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,11 @@
+desc "Run Test::Unit Cases"
+task :test do
+  system("testrb test/*_test.rb")
+end
+
+#namespace :test do
+#  desc "Run RCov analysis"
+#  task :rcov do
+#    system(%{rcov -x '.rvm' -x '/test/data/' test/*_test.rb})
+#  end
+#end
diff --git a/test/TestFilter.rb b/test/filter_test.rb
similarity index 92%
rename from test/TestFilter.rb
rename to test/filter_test.rb
index f295473..64fb240 100644
--- a/test/TestFilter.rb
+++ b/test/filter_test.rb
@@ -1,7 +1,5 @@
-require 'rubygems'
-require 'test/unit'
-require 'fakefs/safe'
-require File.dirname(__FILE__) + '/../classes/Filter.rb'
+require 'test_helper'
+require 'minicomic-backend/filter'
 
 class TestFilter < Test::Unit::TestCase
   def setup
diff --git a/test/TestImageProcessing.rb b/test/image_processing_test.rb
similarity index 92%
rename from test/TestImageProcessing.rb
rename to test/image_processing_test.rb
index 31cb4cc..c0f01c3 100644
--- a/test/TestImageProcessing.rb
+++ b/test/image_processing_test.rb
@@ -1,8 +1,4 @@
-require 'rubygems'
-require 'test/unit'
-require 'mocha'
-require 'fakefs/safe'
-require File.dirname(__FILE__) + '/../modules/ImageProcessing.rb'
+require 'minicomic-backend/image_processing'
 
 class TestImageProcessing < Test::Unit::TestCase
   def setup
diff --git a/test/TestOutputFilter.rb b/test/output_filter_test.rb
similarity index 72%
rename from test/TestOutputFilter.rb
rename to test/output_filter_test.rb
index 52d54d3..16fae1d 100644
--- a/test/TestOutputFilter.rb
+++ b/test/output_filter_test.rb
@@ -1,7 +1,5 @@
-require 'rubygems'
-require 'test/unit'
-require 'mocha'
-require File.dirname(__FILE__) + '/../classes/OutputFilter.rb'
+require 'test_helper'
+require 'minicomic-backend/output_filter'
 
 class TestOutputFilter < Test::Unit::TestCase
   def setup
diff --git a/test/TestPagination.rb b/test/pagination_test.rb
similarity index 82%
rename from test/TestPagination.rb
rename to test/pagination_test.rb
index f7f8ced..0ba81fe 100644
--- a/test/TestPagination.rb
+++ b/test/pagination_test.rb
@@ -1,6 +1,5 @@
-require 'rubygems'
-require 'test/unit'
-require File.dirname(__FILE__) + '/../modules/Pagination.rb'
+require 'test_helper'
+require 'minicomic-backend/pagination'
 
 class TestPagination < Test::Unit::TestCase
   def setup
diff --git a/test/TestPrintHandling.rb b/test/print_handling_test.rb
similarity index 91%
rename from test/TestPrintHandling.rb
rename to test/print_handling_test.rb
index c3d59d7..893b3b7 100644
--- a/test/TestPrintHandling.rb
+++ b/test/print_handling_test.rb
@@ -1,8 +1,5 @@
-require 'rubygems'
-require 'test/unit'
-require 'mocha'
-require 'fakefs/safe'
-require File.dirname(__FILE__) + '/../modules/PrintHandling.rb'
+require 'test_helper'
+require 'minicomic-backend/print_handling'
 
 class TestPrintHandling < Test::Unit::TestCase
   def setup
diff --git a/test/TestScheduler.rb b/test/scheduler_test.rb
similarity index 95%
rename from test/TestScheduler.rb
rename to test/scheduler_test.rb
index dbdc2a3..b6c2913 100644
--- a/test/TestScheduler.rb
+++ b/test/scheduler_test.rb
@@ -1,6 +1,5 @@
-require 'rubygems'
-require 'test/unit'
-require File.dirname(__FILE__) + '/../classes/Scheduler.rb'
+require 'test_helper'
+require 'minicomic-backend/scheduler'
 
 class TestScheduler < Test::Unit::TestCase
   def setup
diff --git a/test/TestSVGToTempBitmap.rb b/test/svg_to_temp_bitmap_test.rb
similarity index 96%
rename from test/TestSVGToTempBitmap.rb
rename to test/svg_to_temp_bitmap_test.rb
index 2278072..826c3d5 100644
--- a/test/TestSVGToTempBitmap.rb
+++ b/test/svg_to_temp_bitmap_test.rb
@@ -1,7 +1,5 @@
-require 'rubygems'
-require 'test/unit'
-require 'fakefs/safe'
-require File.dirname(__FILE__) + '/../classes/SVGToTempBitmap.rb'
+require 'test_helper'
+require 'minicomic-backend/svg_to_temp_bitmap'
 
 class TestSVGToTempBitmap < Test::Unit::TestCase
   def setup
diff --git a/test/TestTempBitmapToWeb.rb b/test/temp_bitmap_to_web_test.rb
similarity index 85%
rename from test/TestTempBitmapToWeb.rb
rename to test/temp_bitmap_to_web_test.rb
index 1d662b3..4e5b0ec 100644
--- a/test/TestTempBitmapToWeb.rb
+++ b/test/temp_bitmap_to_web_test.rb
@@ -1,7 +1,5 @@
-require 'rubygems'
-require 'test/unit'
-require 'mocha'
-require File.dirname(__FILE__) + '/../classes/TempBitmapToWeb.rb'
+require 'test_helper'
+require 'minicomic-backend/temp_bitmap_to_web'
 
 class TestTempBitmapToWeb < Test::Unit::TestCase
   def setup
@@ -30,5 +28,4 @@ class TestTempBitmapToWeb < Test::Unit::TestCase
     }
     assert_equal 'test2010-01-01', @filter.filename({'index' => 0})
   end
-
 end