diff --git a/test-salt-formulas-env.groovy b/test-salt-formulas-env.groovy
index 19079b5..de631bf 100644
--- a/test-salt-formulas-env.groovy
+++ b/test-salt-formulas-env.groovy
@@ -37,7 +37,7 @@
 
 throttle(['test-formula']) {
   timeout(time: 1, unit: 'HOURS') {
-    node("old16.04") {
+    node("python&&docker") {
       try {
         stage("checkout") {
           if (defaultGitRef && defaultGitUrl) {
diff --git a/test-salt-formulas-pipeline.groovy b/test-salt-formulas-pipeline.groovy
index e84386a..640cfed 100644
--- a/test-salt-formulas-pipeline.groovy
+++ b/test-salt-formulas-pipeline.groovy
@@ -14,9 +14,7 @@
 def gerritRef = env.GERRIT_REFSPEC ?: null
 def defaultGitRef = env.DEFAULT_GIT_REF ?: null
 def defaultGitUrl = env.DEFAULT_GIT_URL ?: null
-// vkhlyunev: New slaves breaks old jobs, sticking to ols slaves until fixed
-//def slaveNode = env.SLAVE_NODE ?: 'virtual'
-def slaveNode = env.SLAVE_NODE ?: 'old16.04'
+def slaveNode = env.SLAVE_NODE ?: 'virtual'
 def saltVersion = env.SALT_VERSION ?: ""
 
 gerritBranch = 'master'