diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..207d5fc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.tox
+output
diff --git a/jenkins-tp/jobs/builders/update-jenkins-post-job.sh b/jenkins-tp/jobs/builders/update-jenkins-post-job.sh
index 0015851..3b1da8f 100644
--- a/jenkins-tp/jobs/builders/update-jenkins-post-job.sh
+++ b/jenkins-tp/jobs/builders/update-jenkins-post-job.sh
@@ -5,10 +5,6 @@ echo "This is job for update jenkins jobs after merge"
 
 git clone https://git.openstack.org/$ZUUL_PROJECT .
 
-tox -e fuel-ccp-ci
-
-source ".tox/fuel-ccp-ci/bin/activate"
-
 cat > jenkins_jobs.ini << EOF
 [jenkins]
 user=${JJB_USER}
@@ -20,7 +16,5 @@ ignore_cache=True
 recursive=True
 EOF
 
-jenkins-jobs --flush-cache --conf jenkins_jobs.ini update \
-	                           --delete-old jenkins-tp/jobs
-
-deactivate
+tox -e venv -- jenkins-jobs --flush-cache --conf jenkins_jobs.ini update \
+                            --delete-old jenkins-tp/jobs
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 0000000..520e95b
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1 @@
+bashate>=0.2
diff --git a/tox.ini b/tox.ini
index 4e74e9f..bc2c12a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,21 +3,24 @@ minversion = 1.6
 skipsdist = True
 envlist = bashate,fuel-ccp-ci
 
+[testenv]
+deps =
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/test-requirements.txt
+usedevelop = False
+
 [testenv:linters]
 deps = yamllint
 commands =
     {toxinidir}/tools/run-check-yaml-syntax.sh
 
 [testenv:bashate]
-deps = bashate>=0.2
 whitelist_externals = bash
 commands = bash -c "find {toxinidir} -type f -name '*.sh' -not -path '*/.tox/*' -print0 | xargs -0 bashate -v"
 
-[testenv]
-basepython = python2
-deps = -r{toxinidir}/requirements.txt
-usedevelop = False
-commands =
-    jenkins-jobs --conf conf/jenkins_job.ini.example test jenkins-tp/jobs -o {toxinidir}/output/{envname}
+[testenv:venv]
+commands = {posargs}
 
 [testenv:fuel-ccp-ci]
+commands =
+    jenkins-jobs --conf conf/jenkins_job.ini.example test jenkins-tp/jobs -o {toxinidir}/output/{envname}