diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 684e084..f323bb5 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -63,6 +63,7 @@
 
     # regexp for gerrit triggers
     # list of supported branches, for branch-regexp
+    all-branches-regexp: '.*'
     supported-branches-regexp: '^(master|cord-6.1|seba-1.0|cord-6.0|cord-5.0|cord-4.1|cord-4.0)$'
     legacy-branches-regexp: '^(cord-5.0|cord-4.1|cord-4.0)$'
     modern-branches-regexp: '^(master|cord-6.0|cord-6.1|seba-1.0)$'
diff --git a/jjb/python-unit.yaml b/jjb/python-unit.yaml
index 18bdb96..2e7bbfb 100644
--- a/jjb/python-unit.yaml
+++ b/jjb/python-unit.yaml
@@ -44,11 +44,16 @@
           #!/usr/bin/env bash
           set -eux -o pipefail
 
-          if [ -f 'tox.ini' ]; then
+          if [ -f 'Makefile' ]; then
+            echo "Makefile found, running 'make test'"
+            make test
+
+          elif [ -f 'tox.ini' ]; then
             echo "tox.ini found, running tox for Python2/3 unit tests"
             tox
+
           else
-            echo "tox.ini not found, running nose2 unit tests"
+            echo "Makefile or tox.ini not found, running nose2 unit tests"
 
             if [ -f 'requirements.txt' ]; then
               echo "requirements.txt found, installing locally with pip"
diff --git a/jjb/verify/att-workflow-driver.yaml b/jjb/verify/att-workflow-driver.yaml
index f5ec604..0c915f2 100644
--- a/jjb/verify/att-workflow-driver.yaml
+++ b/jjb/verify/att-workflow-driver.yaml
@@ -7,7 +7,7 @@
 
     jobs:
       - 'verify-att-workflow-driver-jobs':
-          branch-regexp: '{supported-branches-regexp}'
+          branch-regexp: '{all-branches-regexp}'
 
 - job-group:
     name: 'verify-att-workflow-driver-jobs'
diff --git a/jjb/voltha-unit-test.yaml b/jjb/voltha-unit-test.yaml
index 22b4456..d6bf304 100644
--- a/jjb/voltha-unit-test.yaml
+++ b/jjb/voltha-unit-test.yaml
@@ -35,7 +35,7 @@
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
-    node: 'ubuntu16.04-basebuild-4c-8g'
+    node: 'ubuntu16.04-basebuild-2c-4g'
     project-type: freestyle
     concurrent: true