diff --git a/mtce/src/pmon/scripts/pmon-test.sh b/mtce/src/pmon/scripts/pmon-test.sh
index fda08a70..35594538 100755
--- a/mtce/src/pmon/scripts/pmon-test.sh
+++ b/mtce/src/pmon/scripts/pmon-test.sh
@@ -151,7 +151,7 @@ do
         debounce=1
         startuptime=1
         factor=1
-         # Not all processes can be stopped
+        # Not all processes can be stopped
         if [ "$process" == "pmond" -o "$process" == "sm" ] ; then
             echo "${process} stop not supported ... skipping"
             continue
diff --git a/tox.ini b/tox.ini
index 8e2ee447..86af971d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ skipsdist = True
 
 [testenv]
 install_command = pip install \
-    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \
+    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/starlingx/root/raw/branch/master/build-tools/requirements/debian/upper-constraints.txt} \
     {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          OS_STDOUT_CAPTURE=1
@@ -31,12 +31,11 @@ commands =
           -or -not -wholename \*/devstack/files/\* \
           -wholename \*/devstack/\*           \
          \)                                   \
-         -print0 | xargs -n 1 -0 bashate -v -i E010,E006"
-  bash -c "find {toxinidir}        \
-            \( -name middleware/io-monitor/recipes-common/io-monitor/io-monitor/io_monitor/test-tools/yaml/* -prune \) \
-            -o \( -name .tox -prune \)         \
-            -o -type f -name '*.yaml'       \
-            -print0 | xargs -0 yamllint"
+         -print0 | xargs -r -n 1 -0 bashate -v -i E010,E006"
+  bash -c "find {toxinidir}                     \
+        -name .tox -prune                       \
+        -o -type f -name '*.yaml'               \
+        -print0 | xargs -0 yamllint -f parsable"
 
 [testenv:pylint]
 basepython = python3