diff --git a/.travis.yml b/.travis.yml
index cbd7f97..3ef5a3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,11 @@
 rvm:
-- 1.8.7
-- 1.9.2
+  - 1.9.2
+  - 2.0.0
+  - 2.1.9
+  - 2.2.5
+  - 2.3.1
 gemfile:
-- Gemfile
+  - Gemfile
 env:
 notifications:
   recipients:
diff --git a/Gemfile b/Gemfile
index a1886fe..17ca889 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,11 +1,3 @@
 source  "https://rubygems.org"
-gemspec
-
-group :development do
-  gem "rake"
-  gem "yard"
-end
 
-group :test do
-  gem "mocha"
-end
+gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
index 618f71e..974db32 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,18 +7,27 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    macaddr (1.6.7)
+    macaddr (1.7.1)
       systemu (~> 2.6.2)
-    mocha (0.9.12)
-    rake (0.8.7)
-    systemu (2.6.4)
-    yard (0.6.7)
+    metaclass (0.0.4)
+    mocha (1.2.0)
+      metaclass (~> 0.0.1)
+    power_assert (0.3.1)
+    rake (10.5.0)
+    systemu (2.6.5)
+    test-unit (3.1.9)
+      power_assert
+    yard (0.6.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  mocha
-  rake
+  mocha (~> 1.2.0)
+  rake (~> 10.5.0)
+  test-unit (~> 3.1.8)
   uuid!
-  yard
+  yard (~> 0.6.7)
+
+BUNDLED WITH
+   1.13.3
diff --git a/Rakefile b/Rakefile
index 35d05a7..ad7b2b8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,28 +1,17 @@
 require 'rake/testtask'
-#require 'rake/rdoctask'
-
 
 spec = Gem::Specification.load(File.expand_path("uuid.gemspec", File.dirname(__FILE__)))
 
 desc "Default Task"
-task :default => :test
-
+task default: :test
 
 desc "Run all test cases"
-Rake::TestTask.new do |test|
-  test.verbose = true
-  test.test_files = ['test/*.rb']
-  test.warning = true
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/*.rb']
+  t.verbose = true
 end
 
-# Create the documentation.
-#Rake::RDocTask.new do |rdoc|
-#  rdoc.rdoc_files.include "README.rdoc", "lib/**/*.rb"
-#  rdoc.options = spec.rdoc_options
-#end
-
-
-
 desc "Push new release to rubyforge and git tag"
 task :push do
   sh "git push"
diff --git a/test/test-uuid.rb b/test/test-uuid.rb
index 335bb0d..7b6a215 100644
--- a/test/test-uuid.rb
+++ b/test/test-uuid.rb
@@ -4,10 +4,10 @@
 # Copyright:: Copyright (c) 2005-2008 Assaf Arkin, Eric Hodel
 # License:: MIT and/or Creative Commons Attribution-ShareAlike
 
-require 'test/unit'
 require 'rubygems'
+require 'test/unit'
+require 'mocha/test_unit'
 require 'uuid'
-require 'mocha'
 
 class TestUUID < Test::Unit::TestCase
 
diff --git a/uuid.gemspec b/uuid.gemspec
index bd29a27..b573a4c 100644
--- a/uuid.gemspec
+++ b/uuid.gemspec
@@ -19,5 +19,10 @@ EOF
                        '--webcvs' << 'http://github.com/assaf/uuid'
   s.extra_rdoc_files = ['README.rdoc', 'MIT-LICENSE']
 
-  s.add_dependency 'macaddr', ['~>1.0']
+  s.add_dependency 'macaddr', '~> 1.0'
+
+  s.add_development_dependency 'rake', '~> 10.5.0'
+  s.add_development_dependency 'test-unit', '~> 3.1.8'
+  s.add_development_dependency 'mocha', '~> 1.2.0'
+  s.add_development_dependency 'yard', '~> 0.6.7'
 end