diff --git a/Rakefile b/Rakefile
index 2995527..f9a193c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1 +1,27 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
+Bundler::GemHelper.install_tasks
+
+task :console do
+  puts "Loading development console..."
+  system("irb -r active_model_otp")
+end
+
+task :help do
+  puts "Available rake tasks: "
+  puts "rake console - Run a IRB console with all enviroment loaded"
+  puts "rake test - Run tests"
+end
+
+task :test do
+  Dir.chdir('test')
+end
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << '../lib'
+  t.libs << '../test'
+  t.test_files = FileList['*_test.rb']
+  t.verbose = false
+end
+
+task :default => :test
diff --git a/active_model_otp.gemspec b/active_model_otp.gemspec
index 696e8ce..02ac3e3 100644
--- a/active_model_otp.gemspec
+++ b/active_model_otp.gemspec
@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "minitest"
 end
diff --git a/test/gem_test.rb b/test/gem_test.rb
new file mode 100644
index 0000000..1d870b2
--- /dev/null
+++ b/test/gem_test.rb
@@ -0,0 +1,6 @@
+require "test_helper"
+class AppTest < MiniTest::Unit::TestCase
+  def test_the_truth
+    assert true
+  end
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
new file mode 100644
index 0000000..5f43b5a
--- /dev/null
+++ b/test/test_helper.rb
@@ -0,0 +1,10 @@
+testdir = File.dirname(__FILE__)
+$LOAD_PATH.unshift testdir unless $LOAD_PATH.include?(testdir)
+
+libdir = File.dirname(File.dirname(__FILE__)) + '/lib'
+$LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir)
+
+require "rubygems"
+require "active_model_otp"
+require "minitest/unit"
+require "minitest/autorun"