diff --git a/Rakefile b/Rakefile
index 7a1e16c..dda543c 100755
--- a/Rakefile
+++ b/Rakefile
@@ -32,7 +32,7 @@ unless defined? RADIANT_ROOT
 end
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'rake/testtask'
 
 rspec_base = File.expand_path(RADIANT_ROOT + '/vendor/plugins/rspec/lib')
diff --git a/spec/controllers/copy_move_controller_spec.rb b/spec/controllers/copy_move_controller_spec.rb
index 2c5760f..9da8b12 100644
--- a/spec/controllers/copy_move_controller_spec.rb
+++ b/spec/controllers/copy_move_controller_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Admin::PagesController do
   dataset :users_and_pages
diff --git a/spec/models/copy_move_spec.rb b/spec/models/copy_move_spec.rb
index 19d2f2b..9a29b55 100644
--- a/spec/models/copy_move_spec.rb
+++ b/spec/models/copy_move_spec.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe CopyMove do
   dataset :pages, :users
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0adbf9f..09738b6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -12,6 +12,12 @@
 require "#{RADIANT_ROOT}/spec/spec_helper"
 
 Dataset::Resolver.default << (File.dirname(__FILE__) + "/datasets")
+# Include any datasets from loaded extensions
+Radiant::Extension.descendants.each do |extension|
+  if File.directory?(extension.root + "/spec/datasets")
+    Dataset::Resolver.default << (extension.root + "/spec/datasets")
+  end
+end
 
 if File.directory?(File.dirname(__FILE__) + "/matchers")
   Dir[File.dirname(__FILE__) + "/matchers/*.rb"].each {|file| require file }