diff --git a/.zuul.yaml b/.zuul.yaml
index 36a2ae8..be559de 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -40,16 +40,13 @@
     templates:
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
-      - openstack-python-jobs
       - openstack-python3-ussuri-jobs
       - publish-openstack-docs-pti
     check:
       jobs:
         - kollacli-tox-mypy
-        - kollacli-tox-functional-py27
         - kollacli-tox-functional-py36
     gate:
       jobs:
         - kollacli-tox-mypy
-        - kollacli-tox-functional-py27
         - kollacli-tox-functional-py36
diff --git a/kolla_cli/tests/functional/test_service.py b/kolla_cli/tests/functional/test_service.py
index 79c7bd4..16aef64 100644
--- a/kolla_cli/tests/functional/test_service.py
+++ b/kolla_cli/tests/functional/test_service.py
@@ -197,18 +197,6 @@ class TestFunctional(KollaCliTest):
                          'Group: %s, still listed in services: %s'
                          % (test_group, msg))
 
-    def test_ceph(self):
-        # ceph has an odd structure in the upstream all-in-one file.
-        # It was changed in 3.0.1 of kolla. This test is to check that
-        # the kolla change was not overwritten by a kolla update from upstream.
-        # If the upstream file is used, ceph will default to having no
-        # groups.
-        inventory = Inventory.load()
-        ceph = inventory.get_service('ceph')
-        groups = ceph.get_groupnames()
-        self.assertIsNot(groups, 'ceph has no groups, could be due to '
-                         'using an unpatched upstream all-in-one file.')
-
 
 if __name__ == '__main__':
     unittest.main()