--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,4 @@
 require 'rubygems'
-require 'rake/testtask'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 require 'spec/rake/spectask'
@@ -15,15 +14,10 @@ RELEASE_NAME  = "REL #{PKG_VERSION}"
 RUBY_FORGE_PROJECT = "piston"
 RUBY_FORGE_USER    = "fbos"
 
-task :default => :test
-Rake::TestTask.new { |t|
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-  t.warning = false
-}
+task :default => :specs
 
 # Create compressed packages
-dist_dirs = [ "lib", "test"]
+dist_dirs = [ "lib", "spec"]
 
 spec = Gem::Specification.new do |s|
   s.name = PKG_NAME
@@ -35,7 +29,7 @@ spec = Gem::Specification.new do |s|
   s.executables = ["piston"]
   s.default_executable = "piston"
 
-  s.files = [ "CHANGELOG", "README", "LICENSE", "Rakefile" ] + FileList["{contrib,bin,test,lib}/**/*"].to_a
+  s.files = [ "CHANGELOG", "README", "LICENSE", "Rakefile" ] + FileList["{contrib,bin,spec,lib}/**/*"].to_a
 
   s.require_path = 'lib'
   s.has_rdoc = false