diff --git a/.zuul.yaml b/.zuul.yaml
index f1f4c9eeef..e9664d0195 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,44 +1,4 @@
 ---
-- job:
-    name: osc-tox-unit-tips
-    parent: openstack-tox
-    description: |
-      Run unit tests for OpenStackClient with master branch of important libs.
-
-      Takes advantage of the base tox job's install-siblings feature.
-    required-projects:
-      - openstack/cliff
-      - openstack/keystoneauth
-      - openstack/openstacksdk
-      - openstack/os-client-config
-      - openstack/osc-lib
-      - openstack/python-openstackclient
-    vars:
-      # Set work dir to openstackclient so that if it's triggered by one of the
-      # other repos the tests will run in the same place
-      zuul_work_dir: src/opendev.org/openstack/python-openstackclient
-
-- job:
-    name: osc-tox-py36-tips
-    parent: openstack-tox-py36
-    description: |
-      Run unit tests for OpenStackClient with master branch of important libs.
-
-      Takes advantage of the base tox job's install-siblings feature.
-    # The job only tests the latest and shouldn't be run on the stable branches
-    branches: ^(?!stable)
-    required-projects:
-      - openstack/cliff
-      - openstack/keystoneauth
-      - openstack/openstacksdk
-      - openstack/os-client-config
-      - openstack/osc-lib
-      - openstack/python-openstackclient
-    vars:
-      # Set work dir to openstackclient so that if it's triggered by one of the
-      # other repos the tests will run in the same place
-      zuul_work_dir: src/opendev.org/openstack/python-openstackclient
-
 - job:
     name: osc-functional-devstack-base
     parent: devstack-tox-functional
@@ -120,39 +80,6 @@
         q-svc: false
       tox_envlist: functional
 
-- job:
-    name: osc-functional-devstack-tips
-    parent: osc-functional-devstack
-    timeout: 7800
-    required-projects:
-      - openstack/cliff
-      - openstack/keystoneauth
-      - openstack/openstacksdk
-      - openstack/os-client-config
-      - openstack/osc-lib
-      - openstack/python-openstackclient
-    vars:
-      devstack_localrc:
-        LIBS_FROM_GIT: python-openstackclient,openstacksdk,osc-lib,os-client-config
-        # This is insufficient, but leaving it here as a reminder of what may
-        # someday be all we need to make this work
-        # disable_python3_package swift
-        DISABLED_PYTHON3_PACKAGES: swift
-      devstack_services:
-        # Swift is not ready for python3 yet: At a minimum keystonemiddleware needs
-        # to be installed in the py2 env, there are probably other things too...
-        s-account: false
-        s-container: false
-        s-object: false
-        s-proxy: false
-        # As swift is not available for this job, c-bak service won't be functional.
-        # The backup related tests can be handled by other jobs having swift enabled.
-        # The backup service along with swift services can be enabled once swift is
-        # compatible with py3
-        c-bak: false
-      tox_envlist: functional
-      tox_install_siblings: true
-
 - secret:
     name: osc-dockerhub
     data:
@@ -211,19 +138,9 @@
       nodes: []
     vars: *osc_image_vars
 
-- project-template:
-    name: osc-tox-unit-tips
-    check:
-      jobs:
-        - osc-tox-py36-tips
-    gate:
-      jobs:
-        - osc-tox-py36-tips
-
 - project:
     templates:
       - openstackclient-plugin-jobs
-      - osc-tox-unit-tips
       - openstack-cover-jobs
       - openstack-python3-ussuri-jobs
       - publish-openstack-docs-pti
@@ -239,10 +156,6 @@
         #     # should be disabled until the New Way of testing against old clouds
         #     # is ready and backported
         #     branches: ^(?!stable/(newton|ocata)).*$
-        - osc-functional-devstack-tips:
-            # The functional-tips job only tests the latest and shouldn't be run
-            # on the stable branches
-            branches: ^(?!stable)
     gate:
       jobs:
         - osc-upload-image