diff --git a/.gitmodules b/.gitmodules
index 9c202c1e8..75729b3e0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "spec/support/homebrew"]
-	path = spec/support/homebrew
+[submodule "test/support/homebrew"]
+	path = test/support/homebrew
 	url = https://github.com/mxcl/homebrew.git
diff --git a/Rakefile b/Rakefile
index a79685b1a..8c66d407f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,7 +1,8 @@
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.pattern = "spec/*_test.rb"
+  t.pattern = "test/*_test.rb"
+  t.libs << 'test'
 end
 
 task :default => :test
diff --git a/spec/cask_test.rb b/test/cask_test.rb
similarity index 92%
rename from spec/cask_test.rb
rename to test/cask_test.rb
index 495f1a079..7620a6372 100644
--- a/spec/cask_test.rb
+++ b/test/cask_test.rb
@@ -1,4 +1,4 @@
-require_relative 'spec_helper'
+require 'test_helper'
 
 describe Cask do
   describe "load" do
diff --git a/spec/support/homebrew b/test/support/homebrew
similarity index 100%
rename from spec/support/homebrew
rename to test/support/homebrew
diff --git a/spec/spec_helper.rb b/test/test_helper.rb
similarity index 88%
rename from spec/spec_helper.rb
rename to test/test_helper.rb
index 4bb7eab87..a2546dfca 100644
--- a/spec/spec_helper.rb
+++ b/test/test_helper.rb
@@ -9,7 +9,7 @@ lib_path = brew_cask_path.join('lib')
 $:.push(lib_path)
 
 # add vendored homebrew to load path
-homebrew_path = brew_cask_path.join('spec', 'support', 'homebrew')
+homebrew_path = brew_cask_path.join('test', 'support', 'homebrew')
 $:.push(homebrew_path.join('Library', 'Homebrew'))
 
 # require homebrew testing env
@@ -24,6 +24,9 @@ require 'minitest/spec'
 require 'minitest/autorun'
 require 'purdytest'
 
+# sometimes you need to mock
+require 'mocha'
+
 # our baby
 require 'cask'