4 files changed, 13 insertions, 32 deletions
diff --git a/activemodel/test/cases/attributes_test.rb b/activemodel/test/cases/attributes_test.rb
deleted file mode 100644
index 5f3ea839a4..0000000000
--- a/activemodel/test/cases/attributes_test.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'cases/helper'
-
-class AttributesTest < ActiveModel::TestCase
-  class Person
-    include ActiveModel::Attributes
-    attr_accessor :name
-  end
-
-  test "reads attribute" do
-    p = Person.new
-    assert_equal nil, p.read_attribute(:name)
-
-    p.name = "Josh"
-    assert_equal "Josh", p.read_attribute(:name)
-  end
-
-  test "writes attribute" do
-    p = Person.new
-    assert_equal nil, p.name
-
-    p.write_attribute(:name, "Josh")
-    assert_equal "Josh", p.name
-  end
-
-  test "returns all attributes" do
-    p = Person.new
-    p.name = "Josh"
-    assert_equal({"name" => "Josh"}, p.attributes)
-  end
-end
diff --git a/activemodel/test/cases/observing_test.rb b/activemodel/test/cases/observing_test.rb
index 564451fa2f..fbf93c19ef 100644
--- a/activemodel/test/cases/observing_test.rb
+++ b/activemodel/test/cases/observing_test.rb
@@ -1,6 +1,8 @@
 require 'cases/helper'
 
-class ObservedModel < ActiveModel::Base
+class ObservedModel
+  include ActiveModel::Observing
+
   class Observer
   end
 end
@@ -17,7 +19,8 @@ class FooObserver < ActiveModel::Observer
   end
 end
 
-class Foo < ActiveModel::Base
+class Foo
+  include ActiveModel::Observing
 end
 
 class ObservingTest < ActiveModel::TestCase
diff --git a/activemodel/test/cases/serializeration/json_serialization_test.rb b/activemodel/test/cases/serializeration/json_serialization_test.rb
index 3e69db110e..6227aedc39 100644
--- a/activemodel/test/cases/serializeration/json_serialization_test.rb
+++ b/activemodel/test/cases/serializeration/json_serialization_test.rb
@@ -3,6 +3,10 @@ require 'models/contact'
 
 class Contact
   include ActiveModel::Serializers::JSON
+
+  def attributes
+    instance_values
+  end
 end
 
 class JsonSerializationTest < ActiveModel::TestCase
diff --git a/activemodel/test/cases/serializeration/xml_serialization_test.rb b/activemodel/test/cases/serializeration/xml_serialization_test.rb
index 57792e900e..e459f6433a 100644
--- a/activemodel/test/cases/serializeration/xml_serialization_test.rb
+++ b/activemodel/test/cases/serializeration/xml_serialization_test.rb
@@ -3,6 +3,10 @@ require 'models/contact'
 
 class Contact
   include ActiveModel::Serializers::Xml
+
+  def attributes
+    instance_values
+  end
 end
 
 class XmlSerializationTest < ActiveModel::TestCase