diff --git a/.zuul.yaml b/.zuul.yaml
index ff268c214..b687c6b60 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,3 +1,23 @@
+- job:
+    name: osc-tox-unit-tips
+    parent: openstack-tox
+    description: |
+      Run unit tests for OpenStackClient with master branch of important libs.
+
+      Uses tox with the ``unit-tips`` environment and master branch of
+      the required-projects below.
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^releasenotes/.*$
+    required-projects:
+      - openstack/os-client-config
+      - openstack/osc-lib
+      - openstack/python-openstackclient
+      - openstack/python-openstacksdk
+    vars:
+      tox_envlist: unit-tips
+
 - job:
     name: osc-functional-devstack-base
     parent: devstack
@@ -11,6 +31,10 @@
     roles:
       - zuul: openstack-infra/devstack
     timeout: 9000
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^releasenotes/.*$
     vars:
       devstack_localrc:
         SWIFT_HASH: "1234123412341234"
@@ -114,13 +138,17 @@
       - openstackclient-plugin-jobs
     check:
       jobs:
+        - osc-tox-unit-tips:
+            # The functional-tips job only tests the latest and shouldn't be run
+            # on the stable branches
+            branches: ^(?!stable)
         - osc-functional-devstack
-        - osc-functional-devstack-n-net:
-            voting: false
-            # The job testing nova-network no longer works before Pike, and
-            # should be disabled until the New Way of testing against old clouds
-            # is ready and backported
-            branches: ^(?!stable/(newton|ocata)).*$
+        # - osc-functional-devstack-n-net:
+        #     voting: false
+        #     # The job testing nova-network no longer works before Pike, and
+        #     # should be disabled until the New Way of testing against old clouds
+        #     # is ready and backported
+        #     branches: ^(?!stable/(newton|ocata)).*$
         - osc-functional-devstack-tips:
             voting: false
             # The functional-tips job only tests the latest and shouldn't be run
diff --git a/tox.ini b/tox.ini
index ca19862ed..5a7850eb4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -53,6 +53,23 @@ commands =
 commands =
     bandit -r openstackclient -x tests -s B105,B106,B107,B401,B404,B603,B606,B607,B110,B605,B101
 
+[testenv:unit-tips]
+usedevelop = True
+install_command =
+    {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+setenv = VIRTUAL_ENV={envdir}
+         OS_STDOUT_CAPTURE=1
+         OS_STDERR_CAPTURE=1
+         OS_TEST_TIMEOUT=60
+deps = -r{toxinidir}/test-requirements.txt
+commands =
+    pip install -q -U -e "git+file://{toxinidir}/../osc-lib#egg=osc_lib"
+    pip install -q -U -e "git+file://{toxinidir}/../os-client-config#egg=os_client_config"
+    pip install -q -U -e "git+file://{toxinidir}/../python-openstacksdk#egg=openstacksdk"
+    pip freeze
+    ostestr {posargs}
+whitelist_externals = ostestr
+
 [testenv:functional]
 setenv = OS_TEST_PATH=./openstackclient/tests/functional
 passenv = OS_*