diff --git a/.zuul.yaml b/.zuul.yaml
index 72b00027..ec9ee7e8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -9,7 +9,7 @@
         - openstack-tox-linters
         - nfv-tox-pep8
         - nfv-tox-py27
-        - nfv-tox-py37
+        - nfv-tox-py36
         - nfv-tox-pylint
         - nova-api-proxy-tox-pep8
         - nova-api-proxy-tox-pylint
@@ -18,7 +18,7 @@
         - openstack-tox-linters
         - nfv-tox-pep8
         - nfv-tox-py27
-        - nfv-tox-py37
+        - nfv-tox-py36
         - nfv-tox-pylint
         - nova-api-proxy-tox-pep8
         - nova-api-proxy-tox-pylint
@@ -30,6 +30,7 @@
     name: nfv-tox-py27
     parent: tox
     description: Run py27 for nfv
+    nodeset: ubuntu-xenial
     required-projects:
       - starlingx/fault
     vars:
@@ -37,16 +38,17 @@
       tox_extra_args: -c nfv/tox.ini
 
 - job:
-    name: nfv-tox-py37
+    name: nfv-tox-py36
     parent: tox
-    description: Run py37 for nfv
+    description: Run py36 for nfv
+    nodeset: ubuntu-bionic
     required-projects:
       - starlingx/fault
     vars:
-      tox_envlist: py37
+      tox_envlist: py36
       tox_extra_args: -c nfv/tox.ini
-      bindep_profile: test py37
-      python_version: 3.7
+      bindep_profile: test py36
+      python_version: 3.6
 
 - job:
     name: nfv-tox-pep8
@@ -62,6 +64,7 @@
     name: nfv-tox-pylint
     parent: tox
     description: Run pylint for nfv
+    nodeset: ubuntu-xenial
     required-projects:
       - starlingx/fault
     vars:
@@ -80,6 +83,7 @@
     name: nova-api-proxy-tox-pylint
     parent: tox
     description: Run pylint for nova-api-proxy
+    nodeset: ubuntu-xenial
     vars:
       tox_envlist: pylint
       tox_extra_args: -c nova-api-proxy/tox.ini
diff --git a/nfv/tox.ini b/nfv/tox.ini
index 2812d90c..7fef8516 100644
--- a/nfv/tox.ini
+++ b/nfv/tox.ini
@@ -141,8 +141,8 @@ commands = cp -v {[nfv]nfv_base_dir}/nfv-tests/nfv_unit_tests/test_data/nfv_vim_
            stestr --test-path={[nfv]nfv_base_dir}/nfv-tests/nfv_unit_tests/tests run '{posargs}'
            stestr slowest
 
-[testenv:py37]
-basepython = python3.7
+[testenv:py36]
+basepython = python3.6
 deps = {[nfv]deps}
        coverage
        fixtures