diff --git a/.gitignore b/.gitignore
index 87290ff..71ad895 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ Session.vim
 .*.swp
 *~
 .test-result
+/coverage
diff --git a/Rakefile b/Rakefile
index 420f8e4..c80a79d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -8,7 +8,7 @@ task "default" => "quick-test"
 
 desc "Run unit tests."
 task "test" do
-  sh "ruby -I lib -I . test/suite.rb"
+  sh "ruby -I lib test/suite.rb"
 end
 
 desc "Quick test run."
@@ -16,6 +16,11 @@ task "quick-test" do
   sh "ruby -I lib -I . test/test_unicode_utils.rb"
 end
 
+desc "Run tests and generate coverage report."
+task "coverage" do
+  sh "ruby -I lib test/coverage.rb"
+end
+
 desc "Build unicode_utils gem."
 task "gem" do
   sh "gem build unicode_utils.gemspec"
diff --git a/test/coverage.rb b/test/coverage.rb
new file mode 100644
index 0000000..c7d02a2
--- /dev/null
+++ b/test/coverage.rb
@@ -0,0 +1,4 @@
+require "simplecov"
+SimpleCov.start
+
+require_relative "suite.rb"
diff --git a/test/suite.rb b/test/suite.rb
index 1ad4b74..d5b6dff 100644
--- a/test/suite.rb
+++ b/test/suite.rb
@@ -1,3 +1,3 @@
-Dir[File.dirname(__FILE__) + "/**/test_*.rb"].each { |fn|
-  require fn
+Dir["#{File.dirname __FILE__}/test_*.rb"].each { |fn|
+  require_relative File.basename(fn)
 }