diff --git a/tox.ini b/tox.ini
index 1632621e..32f963f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,11 +19,16 @@ deps = -r{toxinidir}/requirements.txt
 whitelist_externals = bash
 commands =
   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"
-  bash -c "ls cgcs-patch/bin/*.sh | xargs bashate -v -iE006 {posargs}"
+            -print0 | xargs --no-run-if-empty -0 yamllint"
+  bash -c "find {toxinidir}          \
+         -not \( -type d -name .?\* -prune \) \
+         -type f                              \
+         -not -name \*~                       \
+         -not -name \*.md                     \
+         -name \*.sh                          \
+         -print0 | xargs --no-run-if-empty -0 bashate -v -iE006"
 
 [pep8]
 # Ignoring these warnings
@@ -48,28 +53,16 @@ verbosity=2
 [testenv:py27]
 basepython = python2.7
 deps = {[testenv]deps}
-       {toxinidir}/nfv/nfv-client
-       {toxinidir}/nfv/nfv-common
-       {toxinidir}/nfv/nfv-plugins
-       {toxinidir}/nfv/nfv-vim
 whitelist_externals = cp
                       find
 recreate = True
 commands = {[testenv]commands}
-           cp -v nfv/nfv-tests/nfv_unit_tests/test_data/nfv_vim_db_18.03_GA {envdir}/
-           nosetests --exe -w nfv/nfv-tests/nfv_unit_tests/tests/ '{posargs}'
 
 [testenv:py35]
 basepython = python3
 deps = {[testenv]deps}
-       nfv/nfv-client
-       nfv/nfv-common
-       nfv/nfv-plugins
-       nfv/nfv-vim
 whitelist_externals = cp
                       find
 recreate = True
 commands = {[testenv]commands}
-           cp -v nfv/nfv-tests/nfv_unit_tests/test_data/nfv_vim_db_18.03_GA {envdir}/
-           nosetests --exe -w nfv/nfv-tests/nfv_unit_tests/tests/ '{posargs}'