diff --git a/Gemfile b/Gemfile
index 39e8eb3..6d2f048 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,11 +3,11 @@ source 'http://rubygems.org'
 gemspec
 
 gem 'sqlite3-ruby', :require => 'sqlite3'
+gem 'spree', :path => '../spree'
 
 group :test do
   gem 'rspec-rails', '= 2.7.0'
-  gem 'factory_girl', '= 1.3.3'
-  gem 'factory_girl_rails', '= 1.0.1'
+  gem 'factory_girl_rails', '= 1.3.0'
   gem 'rcov'
   gem 'shoulda'
   gem 'faker'
@@ -23,8 +23,6 @@ group :cucumber do
   gem 'database_cleaner', '~> 0.5.2'
   gem 'nokogiri'
   gem 'capybara'
-  gem 'factory_girl', '= 1.3.3'
-  gem 'factory_girl_rails', '= 1.0.1'
   gem 'faker'
   gem 'launchy'
 
diff --git a/Rakefile b/Rakefile
index abf4cb1..4e970e4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,7 +4,7 @@ require 'rake/packagetask'
 require 'rubygems/package_task'
 require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
-require 'spree_core/testing_support/common_rake'
+require 'spree/core/testing_support/common_rake'
 
 RSpec::Core::RakeTask.new
 Cucumber::Rake::Task.new