diff --git a/generate-cookiecutter-products-auto.groovy b/generate-cookiecutter-products-auto.groovy
index a4757b5..735dfdc 100644
--- a/generate-cookiecutter-products-auto.groovy
+++ b/generate-cookiecutter-products-auto.groovy
@@ -137,7 +137,7 @@
                 }
                 sh(returnStatus: true, script: "tar -zcvf ${clusterName}.tar.gz -C ${modelEnv} .")
                 archiveArtifacts artifacts: "${clusterName}.tar.gz"
-                if(EMAIl_ADDRESS != null && EMAIL_ADDRESS){
+                if(EMAIl_ADDRESS != null && EMAIL_ADDRESS != ""){
                      emailext(to: EMAIL_ADDRESS,
                               attachmentsPattern: "${clusterName}.tar.gz",
                               body: "Mirantis Jenkins\n\nRequested reclass model ${clusterName} has been created and attached to this email.\nEnjoy!\n\nMirantis",
diff --git a/test-salt-formulas-pipeline.groovy b/test-salt-formulas-pipeline.groovy
index e53e652..e862498 100644
--- a/test-salt-formulas-pipeline.groovy
+++ b/test-salt-formulas-pipeline.groovy
@@ -6,6 +6,7 @@
  */
 def common = new com.mirantis.mk.Common()
 def gerrit = new com.mirantis.mk.Gerrit()
+def ruby = new com.mirantis.mk.Ruby()
 
 def gerritRef
 try {
@@ -48,6 +49,18 @@
         }
       }
     }
+    stage("kitchen") {
+      if (fileExists(".kitchen.yml")) {
+        common.infoMsg(".kitchen.yml found running kitchen tests")
+        ruby.ensureRubyEnv()
+        ruby.installKitchen()
+        wrap([$class: 'AnsiColorBuildWrapper']) {
+          ruby.runKitchenTests()
+        }
+      } else {
+        common.infoMsg(".kitchen.yml not found")
+      }
+    }
   } catch (Throwable e) {
      // If there was an error or exception thrown, the build failed
      currentBuild.result = "FAILURE"