diff --git a/spec/core/field_spec.rb b/spec/webrat/core/field_spec.rb
similarity index 85%
rename from spec/core/field_spec.rb
rename to spec/webrat/core/field_spec.rb
index 4383179..87ea0ec 100644
--- a/spec/core/field_spec.rb
+++ b/spec/webrat/core/field_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 module Webrat
   describe CheckboxField do
diff --git a/spec/integration/rails_spec.rb b/spec/webrat/rails/rails_spec.rb
similarity index 100%
rename from spec/integration/rails_spec.rb
rename to spec/webrat/rails/rails_spec.rb