diff --git a/doc/api_samples/os-availability-zone/availability-zone-detail-resp.json b/doc/api_samples/os-availability-zone/availability-zone-detail-resp.json
index 26bf9c0605bc..65f6925908fc 100644
--- a/doc/api_samples/os-availability-zone/availability-zone-detail-resp.json
+++ b/doc/api_samples/os-availability-zone/availability-zone-detail-resp.json
@@ -2,13 +2,6 @@
     "availabilityZoneInfo": [
         {
             "hosts": {
-                "cells": {
-                    "nova-cells": {
-                        "active": true,
-                        "available": true,
-                        "updated_at": null
-                    }
-                },
                 "cert": {
                     "nova-cert": {
                         "active": true,
diff --git a/doc/api_samples/os-hosts/hosts-list-resp.json b/doc/api_samples/os-hosts/hosts-list-resp.json
index 854ca4a767bc..5bdcae9b64e3 100644
--- a/doc/api_samples/os-hosts/hosts-list-resp.json
+++ b/doc/api_samples/os-hosts/hosts-list-resp.json
@@ -29,11 +29,6 @@
             "host_name": "abffda96592c4eacaf4111c28fddee17",
             "service": "scheduler",
             "zone": "internal"
-        },
-        {
-            "host_name": "a8820f04962a4b4ba9fe2e9540c24094",
-            "service": "cells",
-            "zone": "internal"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl
index d1b610e9447c..c38d8928889e 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-availability-zone/availability-zone-detail-resp.json.tpl
@@ -23,13 +23,6 @@
                         "updated_at": %(strtime_or_none)s
                     }
                 },
-                "cells": {
-                    "nova-cells": {
-                        "active": true,
-                        "available": true,
-                        "updated_at": %(strtime_or_none)s
-                    }
-                },
                 "scheduler": {
                     "nova-scheduler": {
                         "active": true,
diff --git a/nova/tests/functional/api_sample_tests/api_samples/os-hosts/hosts-list-resp.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/os-hosts/hosts-list-resp.json.tpl
index cd5bfdf999dd..1d705e83e23a 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/os-hosts/hosts-list-resp.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/os-hosts/hosts-list-resp.json.tpl
@@ -29,11 +29,6 @@
             "host_name": "%(host_name)s",
             "service": "scheduler",
             "zone": "internal"
-        },
-        {
-            "host_name": "%(host_name)s",
-            "service": "cells",
-            "zone": "internal"
         }
     ]
 }
diff --git a/nova/tests/functional/api_sample_tests/test_cells.py b/nova/tests/functional/api_sample_tests/test_cells.py
index 26bac00fe8eb..2f2b0fd1e088 100644
--- a/nova/tests/functional/api_sample_tests/test_cells.py
+++ b/nova/tests/functional/api_sample_tests/test_cells.py
@@ -44,6 +44,7 @@ class CellsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21):
         # db_check_interval < 0 makes cells manager always hit the DB
         self.flags(enable=True, db_check_interval=-1, group='cells')
         super(CellsSampleJsonTest, self).setUp()
+        self.cells = self.start_service('cells', manager=CONF.cells.manager)
         self._stub_cells()
 
     def _stub_cells(self, num_cells=5):
diff --git a/nova/tests/functional/integrated_helpers.py b/nova/tests/functional/integrated_helpers.py
index aff9ec3915fc..310dd8722408 100644
--- a/nova/tests/functional/integrated_helpers.py
+++ b/nova/tests/functional/integrated_helpers.py
@@ -115,7 +115,6 @@ class _IntegratedTestBase(test.TestCase):
 
         self.network = self.start_service('network')
         self.scheduler = self._setup_scheduler_service()
-        self.cells = self.start_service('cells', manager=CONF.cells.manager)
 
     def _get_test_client(self):
         return client.TestOpenStackClient('fake', 'fake', self.auth_url)