diff --git a/.zuul.yaml b/.zuul.yaml
index c8e68a8..7862a9c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,10 +3,85 @@
       - noop-jobs
     check:
       jobs:
-        - stx-github-debug:
+        # - stx-github-debug:
+        #     vars:
+        #       stx_remote_repo: https://github.com/starlingx-staging/tools-contrib.git
+        #       stx_remote_branch: master
+        # - stx-nova-stein-pep8:
+        #     vars:
+        #       stx_remote_repo: https://github.com/gerrykopec/stx-nova.git
+        #       stx_remote_branch: numa_live_migration
+        # - stx-nova-stein-py27:
+        #     vars:
+        #       stx_remote_repo: https://github.com/gerrykopec/stx-nova.git
+        #       stx_remote_branch: numa_live_migration
+        - stx-nova-stein-py36:
             vars:
-              stx_remote_repo: https://github.com/starlingx-staging/tools-contrib.git
-              stx_remote_branch: master
+              stx_remote_repo: https://github.com/gerrykopec/stx-nova.git
+              stx_remote_branch: numa_live_migration
+        # - stx-nova-stein-functional:
+        #     vars:
+        #       stx_remote_repo: https://github.com/gerrykopec/stx-nova.git
+        #       stx_remote_branch: numa_live_migration
+    experimental:
+      jobs:
+        - stx-nova-stein-functional
+
+- job:
+    name: stx-nova-stein-pep8
+    parent: tox
+    required-projects:
+      - name: openstack/nova
+    vars:
+      stx_remote_repo: https://github.com/starlingx-staging/stx-nova.git
+      stx_remote_branch: stx/stein.1
+      stx_repo_dest: src/test-repo
+      tox_extra_args: -c ../../../test-repo/tox.ini
+      tox_envlist: pep8
+    pre-run: playbooks/fetch-remote-repo/pre.yaml
+
+- job:
+    name: stx-nova-stein-py27
+    parent: nova-tox-functional
+    required-projects:
+      - name: openstack/nova
+      - name: openstack/placement
+    vars:
+      stx_remote_repo: https://github.com/starlingx-staging/stx-nova.git
+      stx_remote_branch: stx/stein.1
+      stx_repo_dest: src/test-repo
+      tox_extra_args: -c ../../../test-repo/tox.ini
+      tox_envlist: py27
+    pre-run: playbooks/fetch-remote-repo/pre.yaml
+
+- job:
+    name: stx-nova-stein-py36
+    parent: nova-tox-functional-py36
+    required-projects:
+      - name: openstack/nova
+      - name: openstack/placement
+    vars:
+      stx_remote_repo: https://github.com/starlingx-staging/stx-nova.git
+      stx_remote_branch: stx/stein.1
+      stx_repo_dest: src/test-repo
+      tox_extra_args: -c ../../../test-repo/tox.ini
+      tox_envlist: py36
+    pre-run: playbooks/fetch-remote-repo/pre.yaml
+
+- job:
+    name: stx-nova-stein-functional
+    parent: nova-tox-functional
+    required-projects:
+      - name: openstack/placement
+      - name: openstack/nova
+    vars:
+      stx_remote_repo: https://github.com/starlingx-staging/stx-nova.git
+      stx_remote_branch: stx/stein.1
+      stx_repo_dest: src/test-repo
+      tox_extra_args: -c ../../../test-repo/tox.ini
+      tox_envlist: functional
+      tox_install_siblings: true
+    pre-run: playbooks/fetch-remote-repo/pre.yaml
 
 - job:
     name: stx-github-debug
diff --git a/playbooks/fetch-stx-nova/pre.yaml b/playbooks/fetch-stx-nova/pre.yaml
new file mode 100644
index 0000000..688f8bc
--- /dev/null
+++ b/playbooks/fetch-stx-nova/pre.yaml
@@ -0,0 +1,19 @@
+- hosts: all
+  pre_tasks:
+    - name: Determine if repo directory exists already
+      stat:
+        path: "src/stx-nova"
+      register: stx_nova_exists
+
+    - debug:
+        msg: "Cloning {{ stx_nova_repo }} branch {{ stx_nova_branch }}"
+      when: stx_nova_exists.stat.isdir is undefined
+
+    - name: Clone stx-nova repo
+      git:
+        # repo: https://github.com/starlingx-staging/stx-nova.git
+        # version: stx/stein.1
+        repo: "{{ stx_nova_repo }}"
+        version: "{{ stx_nova_branch }}"
+        dest: "src/stx-nova"
+      when: stx_nova_exists.stat.isdir is undefined
diff --git a/tox.ini b/tox.ini
index 2482104..3135219 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,3 +24,21 @@ envdir = {toxworkdir}/shared
 commands =
   bash -c "pwd; cd ../../../test-repo; git branch"
   ls -l ../../../test-repo
+
+[testenv:pep8]
+commands =
+  bash -c "echo placeholder env: pep8"
+
+[testenv:py27]
+basepython = python2.7
+commands =
+  bash -c "echo placeholder env: py27"
+
+[testenv:py36]
+basepython = python3.6
+commands =
+  bash -c "echo placeholder env: py36"
+
+[testenv:functional]
+commands =
+  bash -c "echo placeholder env: functional"