diff --git a/lib/validates_timeliness.rb b/lib/validates_timeliness.rb
index 12c2246..ecc2543 100644
--- a/lib/validates_timeliness.rb
+++ b/lib/validates_timeliness.rb
@@ -1,7 +1,7 @@
 require 'validates_timeliness/formats'
 require 'validates_timeliness/validator'
 require 'validates_timeliness/validation_methods'
-require 'validates_timeliness/validate_timeliness_matcher' if ENV['RAILS_ENV'] == 'test'
+require 'validates_timeliness/spec/rails/matchers/validate_timeliness' if ENV['RAILS_ENV'] == 'test'
 
 require 'validates_timeliness/active_record/attribute_methods'
 require 'validates_timeliness/active_record/multiparameter_attributes'
diff --git a/lib/validates_timeliness/validate_timeliness_matcher.rb b/lib/validates_timeliness/spec/rails/matchers/validate_timeliness.rb
similarity index 100%
rename from lib/validates_timeliness/validate_timeliness_matcher.rb
rename to lib/validates_timeliness/spec/rails/matchers/validate_timeliness.rb
diff --git a/spec/validate_timeliness_matcher_spec.rb b/spec/spec/rails/matchers/validate_timeliness_spec.rb
similarity index 98%
rename from spec/validate_timeliness_matcher_spec.rb
rename to spec/spec/rails/matchers/validate_timeliness_spec.rb
index 604941e..c4f8f06 100644
--- a/spec/validate_timeliness_matcher_spec.rb
+++ b/spec/spec/rails/matchers/validate_timeliness_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 class NoValidation < Person
 end