diff --git a/doc/v3/api_samples/os-aggregates/aggregate-add-host-post-req.xml b/doc/v3/api_samples/os-aggregates/aggregate-add-host-post-req.xml
deleted file mode 100644
index d6d0fd19a..000000000
--- a/doc/v3/api_samples/os-aggregates/aggregate-add-host-post-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<add_host host="bdb794e5cdd3447c9132ddd8e5cc3d0b" />
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-aggregates/aggregate-metadata-post-req.xml b/doc/v3/api_samples/os-aggregates/aggregate-metadata-post-req.xml
deleted file mode 100644
index d9b935fd4..000000000
--- a/doc/v3/api_samples/os-aggregates/aggregate-metadata-post-req.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<set_metadata>
-    <metadata>
-        <key>value</key>
-    </metadata>
-</set_metadata>
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-aggregates/aggregate-post-req.xml b/doc/v3/api_samples/os-aggregates/aggregate-post-req.xml
deleted file mode 100644
index d25f5f848..000000000
--- a/doc/v3/api_samples/os-aggregates/aggregate-post-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<aggregate name="name" availability_zone="nova" />
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-aggregates/aggregate-post-resp.xml b/doc/v3/api_samples/os-aggregates/aggregate-post-resp.xml
deleted file mode 100644
index 58a1d1770..000000000
--- a/doc/v3/api_samples/os-aggregates/aggregate-post-resp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregate>
-  <name>name</name>
-  <availability_zone>nova</availability_zone>
-  <deleted>False</deleted>
-  <created_at>2013-08-18 12:17:56.757058</created_at>
-  <updated_at>None</updated_at>
-  <deleted_at>None</deleted_at>
-  <id>1</id>
-</aggregate>
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-aggregates/aggregate-remove-host-post-req.xml b/doc/v3/api_samples/os-aggregates/aggregate-remove-host-post-req.xml
deleted file mode 100644
index 174e15a1d..000000000
--- a/doc/v3/api_samples/os-aggregates/aggregate-remove-host-post-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<remove_host host="bdb794e5cdd3447c9132ddd8e5cc3d0b" />
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-aggregates/aggregate-update-post-req.xml b/doc/v3/api_samples/os-aggregates/aggregate-update-post-req.xml
deleted file mode 100644
index 1eb9c38fd..000000000
--- a/doc/v3/api_samples/os-aggregates/aggregate-update-post-req.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<aggregate name="newname" availability_zone="nova2" />
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-aggregates/aggregate-update-post-resp.xml b/doc/v3/api_samples/os-aggregates/aggregate-update-post-resp.xml
deleted file mode 100644
index 004011fac..000000000
--- a/doc/v3/api_samples/os-aggregates/aggregate-update-post-resp.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregate>
-  <name>newname</name>
-  <availability_zone>nova2</availability_zone>
-  <deleted>False</deleted>
-  <created_at>2013-08-18 12:17:57.655769</created_at>
-  <updated_at>2013-08-18 12:17:57.683956</updated_at>
-  <hosts/>
-  <deleted_at>None</deleted_at>
-  <id>1</id>
-  <metadata>
-    <availability_zone>nova2</availability_zone>
-  </metadata>
-</aggregate>
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.xml b/doc/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.xml
deleted file mode 100644
index c9cee55c0..000000000
--- a/doc/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregate>
-  <name>name</name>
-  <availability_zone>nova</availability_zone>
-  <deleted>False</deleted>
-  <created_at>2013-08-18 12:17:57.255783</created_at>
-  <updated_at>None</updated_at>
-  <hosts>
-    <host>bdb794e5cdd3447c9132ddd8e5cc3d0b</host>
-  </hosts>
-  <deleted_at>None</deleted_at>
-  <id>1</id>
-  <metadata>
-    <availability_zone>nova</availability_zone>
-  </metadata>
-</aggregate>
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-aggregates/aggregates-get-resp.xml b/doc/v3/api_samples/os-aggregates/aggregates-get-resp.xml
deleted file mode 100644
index b5574fa2d..000000000
--- a/doc/v3/api_samples/os-aggregates/aggregates-get-resp.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregate>
-  <name>name</name>
-  <availability_zone>nova</availability_zone>
-  <deleted>False</deleted>
-  <created_at>2013-08-18 12:17:56.757058</created_at>
-  <updated_at>None</updated_at>
-  <hosts/>
-  <deleted_at>None</deleted_at>
-  <id>1</id>
-  <metadata>
-    <availability_zone>nova</availability_zone>
-  </metadata>
-</aggregate>
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-aggregates/aggregates-list-get-resp.xml b/doc/v3/api_samples/os-aggregates/aggregates-list-get-resp.xml
deleted file mode 100644
index 3e91a78eb..000000000
--- a/doc/v3/api_samples/os-aggregates/aggregates-list-get-resp.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregates>
-  <aggregate>
-    <name>name</name>
-    <availability_zone>nova</availability_zone>
-    <deleted>False</deleted>
-    <created_at>2013-08-18 12:17:57.241412</created_at>
-    <updated_at>None</updated_at>
-    <hosts/>
-    <deleted_at>None</deleted_at>
-    <id>1</id>
-    <metadata>
-      <availability_zone>nova</availability_zone>
-    </metadata>
-  </aggregate>
-</aggregates>
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.xml b/doc/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.xml
deleted file mode 100644
index ea11da51c..000000000
--- a/doc/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregate>
-  <name>name</name>
-  <availability_zone>nova</availability_zone>
-  <deleted>False</deleted>
-  <created_at>2013-08-18 12:17:56.891817</created_at>
-  <updated_at>None</updated_at>
-  <hosts/>
-  <deleted_at>None</deleted_at>
-  <id>1</id>
-  <metadata>
-    <key>value</key>
-    <availability_zone>nova</availability_zone>
-  </metadata>
-</aggregate>
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml b/doc/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml
deleted file mode 100644
index c9f67ed45..000000000
--- a/doc/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregate>
-  <name>name</name>
-  <availability_zone>nova</availability_zone>
-  <deleted>False</deleted>
-  <created_at>2013-08-18 12:17:57.255783</created_at>
-  <updated_at>None</updated_at>
-  <hosts/>
-  <deleted_at>None</deleted_at>
-  <id>1</id>
-  <metadata>
-    <availability_zone>nova</availability_zone>
-  </metadata>
-</aggregate>
\ No newline at end of file
diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-add-host-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-add-host-post-req.xml.tpl
deleted file mode 100644
index 4454134ef..000000000
--- a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-add-host-post-req.xml.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<add_host host="%(host_name)s" />
diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-metadata-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-metadata-post-req.xml.tpl
deleted file mode 100644
index 72b1e742a..000000000
--- a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-metadata-post-req.xml.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<set_metadata>
-    <metadata>
-        <key>value</key>
-    </metadata>
-</set_metadata>
diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-post-req.xml.tpl
deleted file mode 100644
index 4931476ae..000000000
--- a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-post-req.xml.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<aggregate name="name" availability_zone="nova" />
diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-post-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-post-resp.xml.tpl
deleted file mode 100644
index f8603ac33..000000000
--- a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-post-resp.xml.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregate>
-  <name>name</name>
-  <availability_zone>nova</availability_zone>
-  <deleted>False</deleted>
-  <created_at>%(timestamp)s</created_at>
-  <updated_at>None</updated_at>
-  <deleted_at>None</deleted_at>
-  <id>%(aggregate_id)s</id>
-</aggregate>
diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-remove-host-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-remove-host-post-req.xml.tpl
deleted file mode 100644
index bc2896835..000000000
--- a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-remove-host-post-req.xml.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<remove_host host="%(host_name)s" />
diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-update-post-req.xml.tpl b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-update-post-req.xml.tpl
deleted file mode 100644
index 04ce4fba5..000000000
--- a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-update-post-req.xml.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<aggregate name="newname" availability_zone="nova2" />
diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-update-post-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-update-post-resp.xml.tpl
deleted file mode 100644
index 071e1c43a..000000000
--- a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregate-update-post-resp.xml.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregate>
-  <name>newname</name>
-  <availability_zone>nova2</availability_zone>
-  <deleted>False</deleted>
-  <created_at>%(timestamp)s</created_at>
-  <updated_at>%(timestamp)s</updated_at>
-  <hosts/>
-  <deleted_at>None</deleted_at>
-  <id>1</id>
-  <metadata>
-    <availability_zone>nova2</availability_zone>
-  </metadata>
-</aggregate>
diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.xml.tpl
deleted file mode 100644
index a45a01789..000000000
--- a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-add-host-post-resp.xml.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregate>
-  <name>name</name>
-  <availability_zone>nova</availability_zone>
-  <deleted>False</deleted>
-  <created_at>%(timestamp)s</created_at>
-  <updated_at>None</updated_at>
-  <hosts>
-    <host>%(compute_host)s</host>
-  </hosts>
-  <deleted_at>None</deleted_at>
-  <id>1</id>
-  <metadata>
-    <availability_zone>nova</availability_zone>
-  </metadata>
-</aggregate>
diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-get-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-get-resp.xml.tpl
deleted file mode 100644
index d59d10a84..000000000
--- a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-get-resp.xml.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregate>
-  <name>name</name>
-  <availability_zone>nova</availability_zone>
-  <deleted>False</deleted>
-  <created_at>%(timestamp)s</created_at>
-  <updated_at>None</updated_at>
-  <hosts/>
-  <deleted_at>None</deleted_at>
-  <id>1</id>
-  <metadata>
-    <availability_zone>nova</availability_zone>
-  </metadata>
-</aggregate>
diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-list-get-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-list-get-resp.xml.tpl
deleted file mode 100644
index 0a6173a0b..000000000
--- a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-list-get-resp.xml.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregates>
-  <aggregate>
-    <name>name</name>
-    <availability_zone>nova</availability_zone>
-    <deleted>False</deleted>
-    <created_at>%(timestamp)s</created_at>
-    <updated_at>None</updated_at>
-    <hosts/>
-    <deleted_at>None</deleted_at>
-    <id>1</id>
-    <metadata>
-      <availability_zone>nova</availability_zone>
-    </metadata>
-  </aggregate>
-</aggregates>
diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.xml.tpl
deleted file mode 100644
index 5b229cfc9..000000000
--- a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-metadata-post-resp.xml.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregate>
-  <name>name</name>
-  <availability_zone>nova</availability_zone>
-  <deleted>False</deleted>
-  <created_at>%(timestamp)s</created_at>
-  <updated_at>None</updated_at>
-  <hosts/>
-  <deleted_at>None</deleted_at>
-  <id>1</id>
-  <metadata>
-    <key>value</key>
-    <availability_zone>nova</availability_zone>
-  </metadata>
-</aggregate>
diff --git a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml.tpl
deleted file mode 100644
index d59d10a84..000000000
--- a/nova/tests/integrated/v3/api_samples/os-aggregates/aggregates-remove-host-post-resp.xml.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<aggregate>
-  <name>name</name>
-  <availability_zone>nova</availability_zone>
-  <deleted>False</deleted>
-  <created_at>%(timestamp)s</created_at>
-  <updated_at>None</updated_at>
-  <hosts/>
-  <deleted_at>None</deleted_at>
-  <id>1</id>
-  <metadata>
-    <availability_zone>nova</availability_zone>
-  </metadata>
-</aggregate>
diff --git a/nova/tests/integrated/v3/test_aggregates.py b/nova/tests/integrated/v3/test_aggregates.py
index a5f6b7e5f..9fd3f8731 100644
--- a/nova/tests/integrated/v3/test_aggregates.py
+++ b/nova/tests/integrated/v3/test_aggregates.py
@@ -79,7 +79,3 @@ class AggregatesSampleJsonTest(api_sample_base.ApiSampleTestBaseV3):
         subs = self._get_regexes()
         self._verify_response('aggregate-update-post-resp',
                               subs, response, 200)
-
-
-class AggregatesSampleXmlTest(AggregatesSampleJsonTest):
-    ctype = 'xml'