diff --git a/internal/pkg/helper/exec/ztf.go b/internal/pkg/helper/exec/ztf.go
index 42248ba6a369467a1649dc4ea6448e7b57f9368d..03e5c4f08b2353fc5caa073faefbd106fb23320b 100644
--- a/internal/pkg/helper/exec/ztf.go
+++ b/internal/pkg/helper/exec/ztf.go
@@ -218,39 +218,43 @@ func FilterCases(cases []string, conf *commDomain.WorkspaceConf) (casesToRun, ca
 		}
 
 		if commonUtils.IsWin() {
-			if path.Ext(cs) == ".sh" { // filter by os
-				continue
-			}
+			filterWinCases(cs, lang, conf, &casesToIgnore, &casesToRun)
+			continue
+		}
 
-			interpreter := configHelper.GetFieldVal(*conf, stringUtils.UcFirst(lang))
-			if interpreter == "-" || interpreter == "" {
-				interpreter = ""
-				if lang != "bat" {
-					ok := AddInterpreterIfExist(conf, lang)
-					if !ok {
-						casesToIgnore = append(casesToIgnore, cs)
-					} else {
-						interpreter = configHelper.GetFieldVal(*conf, stringUtils.UcFirst(lang))
-					}
-				}
-			}
-			if lang != "bat" && interpreter == "" { // ignore the ones with no interpreter set
-				continue
-			}
+		if path.Ext(cs) == ".bat" {
+			continue
+		}
+		casesToRun = append(casesToRun, cs)
+	}
+
+	return
+}
+
+func filterWinCases(cs, lang string, conf *commDomain.WorkspaceConf, casesToIgnore, casesToRun *[]string) {
+	if path.Ext(cs) == ".sh" { // filter by os
+		return
+	}
 
-		} else { // filter by os
-			if path.Ext(cs) == ".bat" {
-				continue
+	interpreter := configHelper.GetFieldVal(*conf, stringUtils.UcFirst(lang))
+
+	if interpreter == "-" || interpreter == "" {
+		interpreter = ""
+		if lang != "bat" {
+			ok := AddInterpreterIfExist(conf, lang)
+			if !ok {
+				*casesToIgnore = append(*casesToIgnore, cs)
+			} else {
+				interpreter = configHelper.GetFieldVal(*conf, stringUtils.UcFirst(lang))
 			}
 		}
+	}
 
-		//pass := scriptHelper.CheckFileIsScript(cs)
-		//if pass {
-		casesToRun = append(casesToRun, cs)
-		//}
+	if lang != "bat" && interpreter == "" { // ignore the ones with no interpreter set
+		return
 	}
 
-	return
+	*casesToRun = append(*casesToRun, cs)
 }
 
 func genReport(productId, id int, by commConsts.ExecBy) (report commDomain.ZtfReport) {