diff --git a/nova/tests/objects/test_aggregate.py b/nova/tests/objects/test_aggregate.py
new file mode 100644
index 000000000..2a6b33040
--- /dev/null
+++ b/nova/tests/objects/test_aggregate.py
@@ -0,0 +1,162 @@
+#    Copyright 2013 IBM Corp.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import datetime
+
+from nova import db
+from nova import exception
+from nova.objects import aggregate
+from nova.openstack.common import timeutils
+from nova.tests.objects import test_objects
+
+
+NOW = timeutils.utcnow().replace(microsecond=0)
+fake_aggregate = {
+    'created_at': NOW,
+    'updated_at': None,
+    'deleted_at': None,
+    'deleted': False,
+    'id': 123,
+    'name': 'fake-aggregate',
+    'hosts': ['foo', 'bar'],
+    'metadetails': {'this': 'that'},
+    }
+
+
+def compare(obj, db_obj):
+    for key in obj.fields:
+        obj_val = obj[key]
+        if isinstance(obj_val, datetime.datetime):
+            obj_val = obj_val.replace(tzinfo=None)
+        if key == 'metadata':
+            key = 'metadetails'
+        db_val = db_obj[key]
+        assert db_val == obj_val, '%s != %s' % (db_val, obj_val)
+
+
+class _TestAggregateObject(object):
+    def test_get_by_id(self):
+        self.mox.StubOutWithMock(db, 'aggregate_get')
+        db.aggregate_get(self.context, 123).AndReturn(fake_aggregate)
+        self.mox.ReplayAll()
+        agg = aggregate.Aggregate.get_by_id(self.context, 123)
+        compare(agg, fake_aggregate)
+
+    def test_create(self):
+        self.mox.StubOutWithMock(db, 'aggregate_create')
+        db.aggregate_create(self.context, {'name': 'foo'},
+                            metadata={'one': 'two'}).AndReturn(fake_aggregate)
+        self.mox.ReplayAll()
+        agg = aggregate.Aggregate()
+        agg.name = 'foo'
+        agg.metadata = {'one': 'two'}
+        agg.create(self.context)
+        compare(agg, fake_aggregate)
+
+    def test_save(self):
+        self.mox.StubOutWithMock(db, 'aggregate_update')
+        db.aggregate_update(self.context, 123, {'name': 'baz'}).AndReturn(
+            fake_aggregate)
+        self.mox.ReplayAll()
+        agg = aggregate.Aggregate()
+        agg.id = 123
+        agg.name = 'baz'
+        agg.save(self.context)
+        compare(agg, fake_aggregate)
+
+    def test_save_and_create_no_hosts(self):
+        agg = aggregate.Aggregate()
+        agg.id = 123
+        agg.hosts = ['foo', 'bar']
+        self.assertRaises(exception.ObjectActionError,
+                          agg.create, self.context)
+        self.assertRaises(exception.ObjectActionError,
+                          agg.save, self.context)
+
+    def test_update_metadata(self):
+        self.mox.StubOutWithMock(db, 'aggregate_metadata_delete')
+        self.mox.StubOutWithMock(db, 'aggregate_metadata_add')
+        db.aggregate_metadata_delete(self.context, 123, 'todelete')
+        db.aggregate_metadata_add(self.context, 123, {'toadd': 'myval'})
+        self.mox.ReplayAll()
+        agg = aggregate.Aggregate()
+        agg._context = self.context
+        agg.id = 123
+        agg.metadata = {'foo': 'bar'}
+        agg.obj_reset_changes()
+        agg.update_metadata({'todelete': None, 'toadd': 'myval'})
+        self.assertEqual({'foo': 'bar', 'toadd': 'myval'}, agg.metadata)
+
+    def test_destroy(self):
+        self.mox.StubOutWithMock(db, 'aggregate_delete')
+        db.aggregate_delete(self.context, 123)
+        self.mox.ReplayAll()
+        agg = aggregate.Aggregate()
+        agg.id = 123
+        agg.destroy(self.context)
+
+    def test_add_host(self):
+        self.mox.StubOutWithMock(db, 'aggregate_host_add')
+        db.aggregate_host_add(self.context, 123, 'bar'
+                              ).AndReturn({'host': 'bar'})
+        self.mox.ReplayAll()
+        agg = aggregate.Aggregate()
+        agg.id = 123
+        agg.hosts = ['foo']
+        agg._context = self.context
+        agg.add_host('bar')
+        self.assertEqual(agg.hosts, ['foo', 'bar'])
+
+    def test_delete_host(self):
+        self.mox.StubOutWithMock(db, 'aggregate_host_delete')
+        db.aggregate_host_delete(self.context, 123, 'foo')
+        self.mox.ReplayAll()
+        agg = aggregate.Aggregate()
+        agg.id = 123
+        agg.hosts = ['foo', 'bar']
+        agg._context = self.context
+        agg.delete_host('foo')
+        self.assertEqual(agg.hosts, ['bar'])
+
+    def test_availability_zone(self):
+        agg = aggregate.Aggregate()
+        agg.metadata = {'availability_zone': 'foo'}
+        self.assertEqual('foo', agg.availability_zone)
+
+    def test_get_all(self):
+        self.mox.StubOutWithMock(db, 'aggregate_get_all')
+        db.aggregate_get_all(self.context).AndReturn([fake_aggregate])
+        self.mox.ReplayAll()
+        aggs = aggregate.AggregateList.get_all(self.context)
+        self.assertEqual(1, len(aggs))
+        compare(aggs[0], fake_aggregate)
+
+    def test_by_host(self):
+        self.mox.StubOutWithMock(db, 'aggregate_get_by_host')
+        db.aggregate_get_by_host(self.context, 'fake-host'
+                                 ).AndReturn([fake_aggregate])
+        self.mox.ReplayAll()
+        aggs = aggregate.AggregateList.get_by_host(self.context, 'fake-host')
+        self.assertEqual(1, len(aggs))
+        compare(aggs[0], fake_aggregate)
+
+
+class TestAggregateObject(test_objects._LocalTest,
+                          _TestAggregateObject):
+    pass
+
+
+class TestRemoteAggregateObject(test_objects._RemoteTest,
+                                _TestAggregateObject):
+    pass