diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1092871..9efd455 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -6,10 +6,11 @@ require 'active_record'
 require 'action_view'
 require 'timecop'
 require 'rspec_tag_matchers'
-require 'model_helpers'
 
 require 'validates_timeliness'
-require 'test_model'
+
+require 'support/test_model'
+require 'support/model_helpers'
 
 ValidatesTimeliness.setup do |c|
   c.extend_orms = [ :active_record ]
@@ -87,6 +88,7 @@ end
 Rspec.configure do |c|
   c.mock_with :rspec
   c.include(RspecTagMatchers)
+  c.include(ModelHelpers)
   c.before do
     Person.reset_callbacks(:validate)
     PersonWithShim.timeliness_validated_attributes = []
diff --git a/spec/model_helpers.rb b/spec/support/model_helpers.rb
similarity index 100%
rename from spec/model_helpers.rb
rename to spec/support/model_helpers.rb
diff --git a/spec/test_model.rb b/spec/support/test_model.rb
similarity index 100%
rename from spec/test_model.rb
rename to spec/support/test_model.rb
diff --git a/spec/validates_timeliness/validator/after_spec.rb b/spec/validates_timeliness/validator/after_spec.rb
index 72de343..e7506de 100644
--- a/spec/validates_timeliness/validator/after_spec.rb
+++ b/spec/validates_timeliness/validator/after_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe ValidatesTimeliness::Validator, ":after option" do
-  include ModelHelpers 
-
   describe "for date type" do
     before do
       Person.validates_date :birth_date, :after => Date.new(2010, 1, 1)
diff --git a/spec/validates_timeliness/validator/before_spec.rb b/spec/validates_timeliness/validator/before_spec.rb
index d856cb3..5007675 100644
--- a/spec/validates_timeliness/validator/before_spec.rb
+++ b/spec/validates_timeliness/validator/before_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe ValidatesTimeliness::Validator, ":before option" do
-  include ModelHelpers 
-
   describe "for date type" do
     before do
       Person.validates_date :birth_date, :before => Date.new(2010, 1, 1)
diff --git a/spec/validates_timeliness/validator/is_at_spec.rb b/spec/validates_timeliness/validator/is_at_spec.rb
index 3451b3f..24e7c8f 100644
--- a/spec/validates_timeliness/validator/is_at_spec.rb
+++ b/spec/validates_timeliness/validator/is_at_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe ValidatesTimeliness::Validator, ":is_at option" do
-  include ModelHelpers 
-
   before do
     Timecop.freeze(Time.local_time(2010, 1, 1, 0, 0, 0))
   end
diff --git a/spec/validates_timeliness/validator/on_or_after_spec.rb b/spec/validates_timeliness/validator/on_or_after_spec.rb
index 0457bea..68c91da 100644
--- a/spec/validates_timeliness/validator/on_or_after_spec.rb
+++ b/spec/validates_timeliness/validator/on_or_after_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe ValidatesTimeliness::Validator, ":on_or_after option" do
-  include ModelHelpers 
-
   describe "for date type" do
     before do
       Person.validates_date :birth_date, :on_or_after => Date.new(2010, 1, 1)
diff --git a/spec/validates_timeliness/validator/on_or_before_spec.rb b/spec/validates_timeliness/validator/on_or_before_spec.rb
index 04af38b..e238aeb 100644
--- a/spec/validates_timeliness/validator/on_or_before_spec.rb
+++ b/spec/validates_timeliness/validator/on_or_before_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe ValidatesTimeliness::Validator, ":on_or_before option" do
-  include ModelHelpers 
-
   describe "for date type" do
     before do
       Person.validates_date :birth_date, :on_or_before => Date.new(2010, 1, 1)
diff --git a/spec/validates_timeliness/validator_spec.rb b/spec/validates_timeliness/validator_spec.rb
index ede36c0..e1b5153 100644
--- a/spec/validates_timeliness/validator_spec.rb
+++ b/spec/validates_timeliness/validator_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe ValidatesTimeliness::Validator do
-  include ModelHelpers
   NIL = [nil]
 
   before do