diff --git a/README.md b/README.md
index a2c689076..157844130 100644
--- a/README.md
+++ b/README.md
@@ -26,8 +26,6 @@ complex, and error-prone.
   tests usage of `validates_numericality_of`.
 * **[validate_presence_of](lib/shoulda/matchers/active_model/validate_presence_of_matcher.rb)**
   tests usage of `validates_presence_of`.
-* **[validate_uniqueness_of](lib/shoulda/matchers/active_model/validate_uniqueness_of_matcher.rb)**
-  tests usage of `validates_uniqueness_of`.
 
 ### ActiveRecord Matchers
 
@@ -51,6 +49,8 @@ complex, and error-prone.
   tests usage of the `attr_readonly` macro.
 * **[serialize](lib/shoulda/matchers/active_record/serialize_matcher.rb)** tests
   usage of the `serialize` macro.
+* **[validate_uniqueness_of](lib/shoulda/matchers/active_record/validate_uniqueness_of_matcher.rb)**
+  tests usage of `validates_uniqueness_of`.
 
 ### ActionController Matchers
 
diff --git a/lib/shoulda/matchers/active_model.rb b/lib/shoulda/matchers/active_model.rb
index 8830e847d..ec4397472 100644
--- a/lib/shoulda/matchers/active_model.rb
+++ b/lib/shoulda/matchers/active_model.rb
@@ -1,5 +1,4 @@
 require 'shoulda/matchers/active_model/helpers'
-require 'shoulda/matchers/active_model/uniqueness'
 require 'shoulda/matchers/active_model/validation_matcher'
 require 'shoulda/matchers/active_model/validation_message_finder'
 require 'shoulda/matchers/active_model/exception_message_finder'
@@ -10,7 +9,6 @@
 require 'shoulda/matchers/active_model/validate_exclusion_of_matcher'
 require 'shoulda/matchers/active_model/validate_absence_of_matcher'
 require 'shoulda/matchers/active_model/validate_presence_of_matcher'
-require 'shoulda/matchers/active_model/validate_uniqueness_of_matcher'
 require 'shoulda/matchers/active_model/validate_acceptance_of_matcher'
 require 'shoulda/matchers/active_model/validate_confirmation_of_matcher'
 require 'shoulda/matchers/active_model/validate_numericality_of_matcher'
diff --git a/lib/shoulda/matchers/active_model/uniqueness.rb b/lib/shoulda/matchers/active_model/uniqueness.rb
deleted file mode 100644
index deb176070..000000000
--- a/lib/shoulda/matchers/active_model/uniqueness.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module Shoulda
-  module Matchers
-    module ActiveModel
-      # @private
-      module Uniqueness
-      end
-    end
-  end
-end
-
-require 'shoulda/matchers/active_model/uniqueness/model'
-require 'shoulda/matchers/active_model/uniqueness/namespace'
-require 'shoulda/matchers/active_model/uniqueness/test_model_creator'
-require 'shoulda/matchers/active_model/uniqueness/test_models'
diff --git a/lib/shoulda/matchers/active_record.rb b/lib/shoulda/matchers/active_record.rb
index c6e9cff4f..7ed16585e 100644
--- a/lib/shoulda/matchers/active_record.rb
+++ b/lib/shoulda/matchers/active_record.rb
@@ -16,6 +16,8 @@
 require "shoulda/matchers/active_record/serialize_matcher"
 require "shoulda/matchers/active_record/accept_nested_attributes_for_matcher"
 require "shoulda/matchers/active_record/define_enum_for_matcher"
+require "shoulda/matchers/active_record/uniqueness"
+require "shoulda/matchers/active_record/validate_uniqueness_of_matcher"
 
 module Shoulda
   module Matchers
diff --git a/lib/shoulda/matchers/active_record/uniqueness.rb b/lib/shoulda/matchers/active_record/uniqueness.rb
new file mode 100644
index 000000000..db935631c
--- /dev/null
+++ b/lib/shoulda/matchers/active_record/uniqueness.rb
@@ -0,0 +1,14 @@
+module Shoulda
+  module Matchers
+    module ActiveModel
+      # @private
+      module Uniqueness
+      end
+    end
+  end
+end
+
+require 'shoulda/matchers/active_record/uniqueness/model'
+require 'shoulda/matchers/active_record/uniqueness/namespace'
+require 'shoulda/matchers/active_record/uniqueness/test_model_creator'
+require 'shoulda/matchers/active_record/uniqueness/test_models'
diff --git a/lib/shoulda/matchers/active_model/uniqueness/model.rb b/lib/shoulda/matchers/active_record/uniqueness/model.rb
similarity index 97%
rename from lib/shoulda/matchers/active_model/uniqueness/model.rb
rename to lib/shoulda/matchers/active_record/uniqueness/model.rb
index 937d50fd7..463b83b73 100644
--- a/lib/shoulda/matchers/active_model/uniqueness/model.rb
+++ b/lib/shoulda/matchers/active_record/uniqueness/model.rb
@@ -1,6 +1,6 @@
 module Shoulda
   module Matchers
-    module ActiveModel
+    module ActiveRecord
       module Uniqueness
         # @private
         class Model
diff --git a/lib/shoulda/matchers/active_model/uniqueness/namespace.rb b/lib/shoulda/matchers/active_record/uniqueness/namespace.rb
similarity index 96%
rename from lib/shoulda/matchers/active_model/uniqueness/namespace.rb
rename to lib/shoulda/matchers/active_record/uniqueness/namespace.rb
index 1fdaa1cf2..770328379 100644
--- a/lib/shoulda/matchers/active_model/uniqueness/namespace.rb
+++ b/lib/shoulda/matchers/active_record/uniqueness/namespace.rb
@@ -1,6 +1,6 @@
 module Shoulda
   module Matchers
-    module ActiveModel
+    module ActiveRecord
       module Uniqueness
         # @private
         class Namespace
diff --git a/lib/shoulda/matchers/active_model/uniqueness/test_model_creator.rb b/lib/shoulda/matchers/active_record/uniqueness/test_model_creator.rb
similarity index 97%
rename from lib/shoulda/matchers/active_model/uniqueness/test_model_creator.rb
rename to lib/shoulda/matchers/active_record/uniqueness/test_model_creator.rb
index eb864b91e..5b3a430e2 100644
--- a/lib/shoulda/matchers/active_model/uniqueness/test_model_creator.rb
+++ b/lib/shoulda/matchers/active_record/uniqueness/test_model_creator.rb
@@ -2,7 +2,7 @@
 
 module Shoulda
   module Matchers
-    module ActiveModel
+    module ActiveRecord
       module Uniqueness
         # @private
         class TestModelCreator
diff --git a/lib/shoulda/matchers/active_model/uniqueness/test_models.rb b/lib/shoulda/matchers/active_record/uniqueness/test_models.rb
similarity index 95%
rename from lib/shoulda/matchers/active_model/uniqueness/test_models.rb
rename to lib/shoulda/matchers/active_record/uniqueness/test_models.rb
index c104bd1b7..f6689ee4d 100644
--- a/lib/shoulda/matchers/active_model/uniqueness/test_models.rb
+++ b/lib/shoulda/matchers/active_record/uniqueness/test_models.rb
@@ -2,7 +2,7 @@
 
 module Shoulda
   module Matchers
-    module ActiveModel
+    module ActiveRecord
       module Uniqueness
         # @private
         module TestModels
diff --git a/lib/shoulda/matchers/active_model/validate_uniqueness_of_matcher.rb b/lib/shoulda/matchers/active_record/validate_uniqueness_of_matcher.rb
similarity index 99%
rename from lib/shoulda/matchers/active_model/validate_uniqueness_of_matcher.rb
rename to lib/shoulda/matchers/active_record/validate_uniqueness_of_matcher.rb
index 6a77d311f..b332524a9 100644
--- a/lib/shoulda/matchers/active_model/validate_uniqueness_of_matcher.rb
+++ b/lib/shoulda/matchers/active_record/validate_uniqueness_of_matcher.rb
@@ -1,6 +1,6 @@
 module Shoulda
   module Matchers
-    module ActiveModel
+    module ActiveRecord
       # The `validate_uniqueness_of` matcher tests usage of the
       # `validates_uniqueness_of` validation. It first checks for an existing
       # instance of your model in the database, creating one if necessary. It
@@ -196,8 +196,8 @@ def validate_uniqueness_of(attr)
       end
 
       # @private
-      class ValidateUniquenessOfMatcher < ValidationMatcher
-        include Helpers
+      class ValidateUniquenessOfMatcher < ActiveModel::ValidationMatcher
+        include ActiveModel::Helpers
 
         def initialize(attribute)
           super(attribute)
diff --git a/spec/unit/shoulda/matchers/active_model/validate_uniqueness_of_matcher_spec.rb b/spec/unit/shoulda/matchers/active_model/validate_uniqueness_of_matcher_spec.rb
index 78223a881..0ea8a2b3e 100644
--- a/spec/unit/shoulda/matchers/active_model/validate_uniqueness_of_matcher_spec.rb
+++ b/spec/unit/shoulda/matchers/active_model/validate_uniqueness_of_matcher_spec.rb
@@ -1,6 +1,6 @@
 require 'unit_spec_helper'
 
-describe Shoulda::Matchers::ActiveModel::ValidateUniquenessOfMatcher do
+describe Shoulda::Matchers::ActiveRecord::ValidateUniquenessOfMatcher do
   context 'a model without a a uniqueness validation' do
     it 'rejects' do
       model = define_model(:example, attr: :string) { attr_accessible :attr } .new