diff --git a/tests/acceptance/00_basics/01_compiler/string_contexts.cf b/tests/acceptance/00_basics/01_compiler/string_contexts.cf
index 835fd8f3f6..980cf7ab04 100644
--- a/tests/acceptance/00_basics/01_compiler/string_contexts.cf
+++ b/tests/acceptance/00_basics/01_compiler/string_contexts.cf
@@ -12,6 +12,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   defaults:
       "s1" string => "1";
       "s2" string => "2";
diff --git a/tests/acceptance/00_basics/01_compiler/with_iteration.cf b/tests/acceptance/00_basics/01_compiler/with_iteration.cf
index 9ea16ee9a0..3b7a903a4a 100644
--- a/tests/acceptance/00_basics/01_compiler/with_iteration.cf
+++ b/tests/acceptance/00_basics/01_compiler/with_iteration.cf
@@ -15,6 +15,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "probe" string => "0";
       "iter" slist => { "1", "2", "3" };
diff --git a/tests/acceptance/00_basics/02_switches/dry_run_perms_doesnt_lie.cf b/tests/acceptance/00_basics/02_switches/dry_run_perms_doesnt_lie.cf
index 3b7c5aa3bb..6755819227 100644
--- a/tests/acceptance/00_basics/02_switches/dry_run_perms_doesnt_lie.cf
+++ b/tests/acceptance/00_basics/02_switches/dry_run_perms_doesnt_lie.cf
@@ -19,6 +19,13 @@ bundle agent init
                   running with dry-run.";
 }
 
+bundle agent test
+{
+  meta:
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10217" };
+}
+
 bundle agent check
 {
   vars:
diff --git a/tests/acceptance/00_basics/03_bodies/dynamic_inputs_findfiles.cf b/tests/acceptance/00_basics/03_bodies/dynamic_inputs_findfiles.cf
index 0b3cb8f34e..753e93cec3 100644
--- a/tests/acceptance/00_basics/03_bodies/dynamic_inputs_findfiles.cf
+++ b/tests/acceptance/00_basics/03_bodies/dynamic_inputs_findfiles.cf
@@ -36,9 +36,6 @@ bundle agent init
 
 bundle agent test
 {
-  meta:
-    "test_suppress_fail" string => "windows",
-      meta => { "redmine4730" };
 }
 
 bundle agent check
diff --git a/tests/acceptance/00_basics/03_bodies/dynamic_inputs_maplist.cf b/tests/acceptance/00_basics/03_bodies/dynamic_inputs_maplist.cf
index d35bf53646..f41108d1e6 100644
--- a/tests/acceptance/00_basics/03_bodies/dynamic_inputs_maplist.cf
+++ b/tests/acceptance/00_basics/03_bodies/dynamic_inputs_maplist.cf
@@ -37,9 +37,6 @@ bundle agent init
 
 bundle agent test
 {
-  meta:
-    "test_suppress_fail" string => "windows",
-      meta => { "redmine4730" };
 }
 
 bundle agent check
diff --git a/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/dynamic_inputs_based_on_list_variable_dependent_on_class.cf b/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/dynamic_inputs_based_on_list_variable_dependent_on_class.cf
index d0ddd43db4..24a5516ed8 100644
--- a/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/dynamic_inputs_based_on_list_variable_dependent_on_class.cf
+++ b/tests/acceptance/00_basics/04_bundles/dynamic_bundlesequence/dynamic_inputs_based_on_list_variable_dependent_on_class.cf
@@ -13,9 +13,11 @@ bundle common inventory
       !this_is_true::
         "inputs"  slist => { };
         "bundles" slist => { "bad" };
-      this_is_true::
+      this_is_true.!windows::
         "inputs"  slist => { "$(this.promise_filename).sub" };
         "bundles" slist => { "good" };
+      windows::
+        "bundles" slist => { "skip" };
 }
 
 bundle agent bad
@@ -23,3 +25,9 @@ bundle agent bad
     reports:
         "$(this.promise_filename) FAIL";
 }
+
+bundle agent skip
+{
+    reports:
+        "$(this.promise_filename) Skip/unsupported";
+}
diff --git a/tests/acceptance/00_basics/04_bundles/namespaced.cf b/tests/acceptance/00_basics/04_bundles/namespaced.cf
index cc79f0eb34..6a10660840 100644
--- a/tests/acceptance/00_basics/04_bundles/namespaced.cf
+++ b/tests/acceptance/00_basics/04_bundles/namespaced.cf
@@ -16,6 +16,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
 }
 
 bundle agent check
diff --git a/tests/acceptance/00_basics/def.json/bad-json.cf b/tests/acceptance/00_basics/def.json/bad-json.cf
index f89435572c..2eb0c23bf9 100644
--- a/tests/acceptance/00_basics/def.json/bad-json.cf
+++ b/tests/acceptance/00_basics/def.json/bad-json.cf
@@ -10,8 +10,12 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
+
   methods:
-      "" usebundle => file_copy("$(this.promise_filename).json", "$(sys.inputdir)/def.json");
+      "" usebundle => file_copy("$(this.promise_filename).json", "$(sys.inputdir)$(const.dirsep)def.json");
 }
 
 #######################################################
@@ -22,5 +26,5 @@ bundle agent check
     "command" string => "$(sys.cf_promises) -v|$(G.grep) JSON";
 
   methods:
-      "" usebundle => dcs_passif_output(".*Could not parse JSON file $(sys.inputdir)/def.json.*", "", $(command), $(this.promise_filename));
+      "" usebundle => dcs_passif_output(".*Could not parse JSON file $(sys.inputdir)$(const.dirsep)def.json.*", "", $(command), $(this.promise_filename));
 }
diff --git a/tests/acceptance/00_basics/def.json/state.cf b/tests/acceptance/00_basics/def.json/state.cf
index d7eeeccab1..e2a33b1396 100644
--- a/tests/acceptance/00_basics/def.json/state.cf
+++ b/tests/acceptance/00_basics/def.json/state.cf
@@ -8,6 +8,15 @@ body common control
 
 #######################################################
 
+bundle agent test
+{
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+}
+
+#######################################################
+
 bundle agent check
 {
   methods:
diff --git a/tests/acceptance/00_basics/macros/if_triple.cf b/tests/acceptance/00_basics/macros/if_triple.cf
index 9577f54a99..0d4a252e61 100644
--- a/tests/acceptance/00_basics/macros/if_triple.cf
+++ b/tests/acceptance/00_basics/macros/if_triple.cf
@@ -1,7 +1,6 @@
 ######################################################
 #
 #  Test that @if works with patch level
-#
 #####################################################
 
 body common control
@@ -13,7 +12,7 @@ body common control
 bundle agent init
 {
   files:
-      "$(G.testdir)/test.cf"
+      "$(G.testdir)$(const.dirsep)test.cf"
         create => "true",
         edit_template => "$(this.promise_filename).sub.template",
         template_method => "mustache";
@@ -22,9 +21,15 @@ bundle agent init
 bundle agent check
 {
   methods:
-      "check" usebundle => dcs_passif_output(".*$(G.testdir)/test.cf Pass.*",
+      # Note: dcs_passif_output expects first argument to be regexp.
+      # To convert Windows-style path (with backslashes) to a regex which will match this path,
+      # we need to convert all backslashes to double-backslashes.
+      # In the command below, each backslash is escaped twice:
+      # once for regex, and once for CFEngine string parser.
+      "check" usebundle => dcs_passif_output(regex_replace(".*$(G.testdir)$(const.dirsep)test.cf Pass.*",
+                                                           "\\\\", "\\\\\\\\", "g"),
                                              ".*FAIL.*",
-                                             "$(sys.cf_agent) -D AUTO -Kf $(G.testdir)/test.cf",
+                                             "$(sys.cf_agent) -D AUTO -Kf $(G.testdir)$(const.dirsep)test.cf",
                                              $(this.promise_filename));
 }
 
diff --git a/tests/acceptance/01_vars/01_basic/sysvars.cf b/tests/acceptance/01_vars/01_basic/sysvars.cf
index 0062b8ec5d..4758b01c3c 100644
--- a/tests/acceptance/01_vars/01_basic/sysvars.cf
+++ b/tests/acceptance/01_vars/01_basic/sysvars.cf
@@ -32,6 +32,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
 }
 
 #######################################################
diff --git a/tests/acceptance/01_vars/01_basic/this_variables.cf b/tests/acceptance/01_vars/01_basic/this_variables.cf
index d24a4cebab..fe30882040 100644
--- a/tests/acceptance/01_vars/01_basic/this_variables.cf
+++ b/tests/acceptance/01_vars/01_basic/this_variables.cf
@@ -18,6 +18,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
   vars:
     "var"      slist => { "var in test" };
     "var_test" slist => { "var_test in test" };
diff --git a/tests/acceptance/01_vars/02_functions/cf_version.cf b/tests/acceptance/01_vars/02_functions/cf_version.cf
index 242f2070ad..dd4a9e86d0 100644
--- a/tests/acceptance/01_vars/02_functions/cf_version.cf
+++ b/tests/acceptance/01_vars/02_functions/cf_version.cf
@@ -15,6 +15,9 @@ body common control
 
 bundle agent test
 {
+  meta:
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10254" };
   vars:
     "after_newer" string => "yes",
       if => cf_version_after("1.0.0");
diff --git a/tests/acceptance/01_vars/02_functions/data_expand.cf b/tests/acceptance/01_vars/02_functions/data_expand.cf
index 3d45a407a5..c211a579f2 100644
--- a/tests/acceptance/01_vars/02_functions/data_expand.cf
+++ b/tests/acceptance/01_vars/02_functions/data_expand.cf
@@ -15,6 +15,9 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
   vars:
       "x" string => "foo";
       "y" int => "200";
diff --git a/tests/acceptance/01_vars/02_functions/every_some_none.cf b/tests/acceptance/01_vars/02_functions/every_some_none.cf
index 9e75f1c470..d8938e5752 100644
--- a/tests/acceptance/01_vars/02_functions/every_some_none.cf
+++ b/tests/acceptance/01_vars/02_functions/every_some_none.cf
@@ -15,6 +15,9 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
   methods:
       "pretest";
       "collect";
diff --git a/tests/acceptance/01_vars/02_functions/execresult.cf b/tests/acceptance/01_vars/02_functions/execresult.cf
index abe2e965ea..d4a64917fd 100644
--- a/tests/acceptance/01_vars/02_functions/execresult.cf
+++ b/tests/acceptance/01_vars/02_functions/execresult.cf
@@ -29,6 +29,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10217" };
   vars:
       "dummy" string => "dummy";
 }
diff --git a/tests/acceptance/01_vars/02_functions/execresult_action_immediate.cf b/tests/acceptance/01_vars/02_functions/execresult_action_immediate.cf
index f273355efa..91a4301b44 100644
--- a/tests/acceptance/01_vars/02_functions/execresult_action_immediate.cf
+++ b/tests/acceptance/01_vars/02_functions/execresult_action_immediate.cf
@@ -26,6 +26,8 @@ bundle agent test
   meta:
       "description" -> {"ENT-7478"}
         string => "If 'ifelapsed => 0' is used, execresult() should run the given command every time";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10217" };
 
   methods:
       "foo" usebundle => check_date("foo");
diff --git a/tests/acceptance/01_vars/02_functions/execresult_select.cf b/tests/acceptance/01_vars/02_functions/execresult_select.cf
index c1f0566693..4f3edda5a2 100644
--- a/tests/acceptance/01_vars/02_functions/execresult_select.cf
+++ b/tests/acceptance/01_vars/02_functions/execresult_select.cf
@@ -18,6 +18,8 @@ bundle agent test
   meta:
       "description" -> { "CFE-3108" }
         string => "Test that you can select stderr/stdout in execresult";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10217" };
 
   vars:
       "result_with_stdout_stderr"
diff --git a/tests/acceptance/01_vars/02_functions/execresult_stderr.cf b/tests/acceptance/01_vars/02_functions/execresult_stderr.cf
index 42a3675a26..d006607268 100644
--- a/tests/acceptance/01_vars/02_functions/execresult_stderr.cf
+++ b/tests/acceptance/01_vars/02_functions/execresult_stderr.cf
@@ -18,6 +18,8 @@ bundle agent test
   meta:
       "description" -> { "CFE-3103" }
         string => "Test that execresult captures both stdout and stderr";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10217" };
 
   vars:
       "result_with_stdout_stderr"
diff --git a/tests/acceptance/01_vars/02_functions/filter.cf b/tests/acceptance/01_vars/02_functions/filter.cf
index 541f14a536..5770348349 100644
--- a/tests/acceptance/01_vars/02_functions/filter.cf
+++ b/tests/acceptance/01_vars/02_functions/filter.cf
@@ -15,6 +15,9 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
   vars:
       "tests" slist => { "fgrep09", "exact1", "exactdot", "regexdot", "invert", "max2", "max0", "grep09" };
       "lists" slist => { "s1", "d1", "d2", "dempty" };
diff --git a/tests/acceptance/01_vars/02_functions/findfiles.cf b/tests/acceptance/01_vars/02_functions/findfiles.cf
index 585f34aba1..749caf0864 100644
--- a/tests/acceptance/01_vars/02_functions/findfiles.cf
+++ b/tests/acceptance/01_vars/02_functions/findfiles.cf
@@ -41,7 +41,7 @@ bundle agent test
 {
   meta:
       "test_suppress_fail" string => "windows",
-        meta => { "redmine4730" };
+        meta => { "redmine4730,ENT-2145" };
 
   vars:
       "patterns[a]" string => "$(G.testdir)/?";
diff --git a/tests/acceptance/01_vars/02_functions/findfiles_up.cf b/tests/acceptance/01_vars/02_functions/findfiles_up.cf
index 269b8a3e04..c89b8dc18d 100755
--- a/tests/acceptance/01_vars/02_functions/findfiles_up.cf
+++ b/tests/acceptance/01_vars/02_functions/findfiles_up.cf
@@ -78,6 +78,8 @@ bundle agent test
   meta:
       "description" -> { "CFE-3577" }
         string => "Test for expected results from policy function search_up";
+      "test_skip_needs_work" string => "windows",
+        meta => { "ENT-10250" };
 
   methods:
        "Test 0"
diff --git a/tests/acceptance/01_vars/02_functions/format_edge_case.cf b/tests/acceptance/01_vars/02_functions/format_edge_case.cf
index 818ae3168f..6a8bbebc75 100644
--- a/tests/acceptance/01_vars/02_functions/format_edge_case.cf
+++ b/tests/acceptance/01_vars/02_functions/format_edge_case.cf
@@ -12,6 +12,9 @@ body common control
 ##########################################################
 
 bundle agent test {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
   vars:
       "str" string => format('%s', 'Hello, everyone! This is the LONGEST TEXT EVER! I was inspired by the various other longest texts ever on the internet, and I wanted to make my own. So here it is! This is going to be a WORLD RECORD! This is actually my third attempt at doing this. The first time, I didnt save it. The second time, the Neocities editor crashed. Now Im writing this in Notepad, then copying it into the Neocities editor instead of typing it directly in the Neocities editor to avoid crashing. It sucks that my past two attempts are gone now. Those actually got pretty long. Not the longest, but still pretty long. I hope this one wont get lost somehow. Anyways, lets talk about WAFFLES! I like waffles. Waffles are cool. Waffles is a funny word. Theres a Teen Titans Go episode called Waffles where the word Waffles is said a hundred-something times. Its pretty annoying. Theres also a Teen Titans Go episode about Pig Latin. Dont know what Pig Latin is? Its a language where you take all the consonants before the first vowel, move them to the end, and add -ay to the end. If the word begins with a vowel, you just add -way to the end. For example, Waffles becomes Afflesway. Ive been speaking Pig Latin fluently since the fourth grade, so it surprised me when I saw the episode for the first time. I speak Pig Latin with my sister sometimes. Its pretty fun. I like speaking it in public so that everyone around us gets confused. Thats never actually happened before, but if it ever does, twill be pretty funny. By the way, twill is a word I invented recently, and its a contraction of it will. I really hope it gains popularity in the near future, because twill is WAY more fun than saying itll. Itll is too boring. Nobody likes boring. This is nowhere near being the longest text ever, but eventually it will be! I might still be writing this a decade later, who knows? But right now, its not very long. But Ill just keep writing until it is the longest! Have you ever heard the song Dau Dau by Awesome Scampis? Its an amazing song. Look it up on YouTube! I play that song all the time around my sister! It drives her crazy, and I love it. Another way I like driving my sister crazy is by speaking my own made up language to her. She hates the languages I make! The only language that we both speak besides English is Pig Latin. I think you already knew that. Whatever. I think Im gonna go for now. Bye! Hi, Im back now. Im gonna contribute more to this soon-to-be giant wall of text. I just realised I have a giant stuffed frog on my bed. I forgot his name. Im pretty sure it was something stupid though. I think it was FROG in Morse Code or something. Morse Code is cool. I know a bit of it, but Im not very good at it. Im also not very good at French. I barely know anything in French, and my pronunciation probably sucks. But Im learning it, at least. Im also learning Esperanto. Its this language that was made up by some guy a long time ago to be the universal language. A lot of people speak it. I am such a language nerd. Half of this text is probably gonna be about languages. But hey, as long as its long! Ha, get it? As LONG as its LONG? Im so funny, right? No, Im not. I should probably get some sleep. Goodnight! Hello, Im back again. I basically have only two interests nowadays: languages and furries. What? Oh, sorry, I thought you knew I was a furry. Haha, oops. Anyway, yeah, Im a furry, but since Im a young furry, I cant really do as much as I would like to do in the fandom. When Im older, I would like to have a fursuit, go to furry conventions, all that stuff. But for now I can only dream of that. Sorry you had to deal with me talking about furries, but Im honestly very desperate for this to be the longest text ever. Last night I was watching nothing but fursuit unboxings. I think I need help. This one time, me and my mom were going to go to a furry Christmas party, but we didnt end up going because of the fact that there was alcohol on the premises, and that she didnt wanna have to be a mom dragging her son through a crowd of furries. Both of those reasons were understandable. Okay, hopefully I wont have to talk about furries anymore. I dont care if youre a furry reading this right now, I just dont wanna have to torture everyone else.');
       "list" slist => { $(str) };
diff --git a/tests/acceptance/01_vars/02_functions/getindices.cf b/tests/acceptance/01_vars/02_functions/getindices.cf
index f682f5d1f8..6c24c3b8be 100644
--- a/tests/acceptance/01_vars/02_functions/getindices.cf
+++ b/tests/acceptance/01_vars/02_functions/getindices.cf
@@ -38,6 +38,9 @@ bundle common b
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
   vars:
       "user[name]"              string => "zamboni";
       "user[fullname][first]"   string => "Diego";
diff --git a/tests/acceptance/01_vars/02_functions/getindices_returns_expected_list_from_array.cf b/tests/acceptance/01_vars/02_functions/getindices_returns_expected_list_from_array.cf
index 01e0561ec1..3e216bc491 100644
--- a/tests/acceptance/01_vars/02_functions/getindices_returns_expected_list_from_array.cf
+++ b/tests/acceptance/01_vars/02_functions/getindices_returns_expected_list_from_array.cf
@@ -38,8 +38,8 @@ bundle agent init
 bundle agent test
 {
   meta:
-      "test_soft_fail" string => "!any",
-        meta => { "redmine7116" };
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
 
   vars:
     "values_data_1" slist => getindices("init.data[bar]");
diff --git a/tests/acceptance/01_vars/02_functions/getindices_returns_expected_list_from_datacontainer.cf b/tests/acceptance/01_vars/02_functions/getindices_returns_expected_list_from_datacontainer.cf
index 677b5a2d35..729f360b31 100644
--- a/tests/acceptance/01_vars/02_functions/getindices_returns_expected_list_from_datacontainer.cf
+++ b/tests/acceptance/01_vars/02_functions/getindices_returns_expected_list_from_datacontainer.cf
@@ -31,8 +31,8 @@ bundle agent init
 bundle agent test
 {
   meta:
-      "test_soft_fail" string => "!any",
-        meta => { "redmine7116" };
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
 
   vars:
       # expected: one, two
diff --git a/tests/acceptance/01_vars/02_functions/gettags.cf b/tests/acceptance/01_vars/02_functions/gettags.cf
index c7eeb3546e..c7c2df54b6 100644
--- a/tests/acceptance/01_vars/02_functions/gettags.cf
+++ b/tests/acceptance/01_vars/02_functions/gettags.cf
@@ -25,6 +25,10 @@ bundle common init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "tags1" slist => getclassmetatags("myclass");
       "tags2" slist => getclassmetatags("myplainclass");
diff --git a/tests/acceptance/01_vars/02_functions/getuserinfo.cf b/tests/acceptance/01_vars/02_functions/getuserinfo.cf
index 36c1d55308..829610105e 100644
--- a/tests/acceptance/01_vars/02_functions/getuserinfo.cf
+++ b/tests/acceptance/01_vars/02_functions/getuserinfo.cf
@@ -13,6 +13,9 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10217" };
   vars:
       # this is pretty much all we can test across platforms
       "info_root" string => nth(getuserinfo("root"), "username");
diff --git a/tests/acceptance/01_vars/02_functions/getvalues.cf b/tests/acceptance/01_vars/02_functions/getvalues.cf
index 9087b7fbea..88909082c0 100644
--- a/tests/acceptance/01_vars/02_functions/getvalues.cf
+++ b/tests/acceptance/01_vars/02_functions/getvalues.cf
@@ -15,6 +15,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "user[name]"              string => "zamboni";
       "user[fullname][first]"   string => "Diego";
diff --git a/tests/acceptance/01_vars/02_functions/getvalues_containers.cf b/tests/acceptance/01_vars/02_functions/getvalues_containers.cf
index c47506e79d..ac67a69aa5 100644
--- a/tests/acceptance/01_vars/02_functions/getvalues_containers.cf
+++ b/tests/acceptance/01_vars/02_functions/getvalues_containers.cf
@@ -15,6 +15,10 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "arr_v" slist => getvalues("init.arr");
 
diff --git a/tests/acceptance/01_vars/02_functions/getvalues_returns_all_values_for_given_datacontainer_index_merging_strings.cf b/tests/acceptance/01_vars/02_functions/getvalues_returns_all_values_for_given_datacontainer_index_merging_strings.cf
index 25822c688d..44c7030ba9 100644
--- a/tests/acceptance/01_vars/02_functions/getvalues_returns_all_values_for_given_datacontainer_index_merging_strings.cf
+++ b/tests/acceptance/01_vars/02_functions/getvalues_returns_all_values_for_given_datacontainer_index_merging_strings.cf
@@ -37,6 +37,10 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "values_data" slist => getvalues("init.data");
       "values_data2" slist => getvalues("init.data2");
diff --git a/tests/acceptance/01_vars/02_functions/ifelse.cf b/tests/acceptance/01_vars/02_functions/ifelse.cf
index e33851efc3..6675c84872 100644
--- a/tests/acceptance/01_vars/02_functions/ifelse.cf
+++ b/tests/acceptance/01_vars/02_functions/ifelse.cf
@@ -23,6 +23,10 @@ bundle common init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   classes:
       "myclass2" expression => "any";
   vars:
diff --git a/tests/acceptance/01_vars/02_functions/ifelse_isvariable.cf b/tests/acceptance/01_vars/02_functions/ifelse_isvariable.cf
index f1eddae20f..4ac101dec6 100644
--- a/tests/acceptance/01_vars/02_functions/ifelse_isvariable.cf
+++ b/tests/acceptance/01_vars/02_functions/ifelse_isvariable.cf
@@ -17,6 +17,8 @@ bundle agent test
   meta:
       "description"
         string => "Test that ifelse can use the result of isvariable as a class identifer";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
 
   vars:
       # Since init.passwd_file is defined, I expect the value to be
diff --git a/tests/acceptance/01_vars/02_functions/inline_json.cf b/tests/acceptance/01_vars/02_functions/inline_json.cf
index 0d27f9e642..ce1a8d9cd4 100644
--- a/tests/acceptance/01_vars/02_functions/inline_json.cf
+++ b/tests/acceptance/01_vars/02_functions/inline_json.cf
@@ -15,6 +15,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "z" string => "100";
       "foo" string => "bar";
diff --git a/tests/acceptance/01_vars/02_functions/join.cf b/tests/acceptance/01_vars/02_functions/join.cf
index 964fcee246..a3ad4c833a 100644
--- a/tests/acceptance/01_vars/02_functions/join.cf
+++ b/tests/acceptance/01_vars/02_functions/join.cf
@@ -15,6 +15,10 @@ body common control
 
 bundle agent init
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "a" slist => { "b", "c", "a" };
       "b" slist => { "100", "9", "10" };
diff --git a/tests/acceptance/01_vars/02_functions/length.cf b/tests/acceptance/01_vars/02_functions/length.cf
index 7c50f21627..d7d093ad33 100644
--- a/tests/acceptance/01_vars/02_functions/length.cf
+++ b/tests/acceptance/01_vars/02_functions/length.cf
@@ -21,6 +21,10 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "normal_list" slist => { "b", "c", "a" }; # 3
       "empty_list" slist => { }; # 0
diff --git a/tests/acceptance/01_vars/02_functions/maparray.cf b/tests/acceptance/01_vars/02_functions/maparray.cf
index 0a8e99a5b6..e7e1d7ffe4 100644
--- a/tests/acceptance/01_vars/02_functions/maparray.cf
+++ b/tests/acceptance/01_vars/02_functions/maparray.cf
@@ -21,6 +21,10 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "load1" data => parsejson('[ 1, 2, 3]');
       "load2" slist => { "eleme\"nt1", "element2", "element3" };
diff --git a/tests/acceptance/01_vars/02_functions/maparray_multi_index.cf b/tests/acceptance/01_vars/02_functions/maparray_multi_index.cf
index a0feb0165d..fa4232aff2 100644
--- a/tests/acceptance/01_vars/02_functions/maparray_multi_index.cf
+++ b/tests/acceptance/01_vars/02_functions/maparray_multi_index.cf
@@ -22,6 +22,10 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
     "bundles[x][y][z1]" string => "xyz1";
     "bundles[x][y][z23]" slist => { "xyz2", "xyz3" };
diff --git a/tests/acceptance/01_vars/02_functions/maplist.cf b/tests/acceptance/01_vars/02_functions/maplist.cf
index 202f94f2d8..6c9066ce4a 100644
--- a/tests/acceptance/01_vars/02_functions/maplist.cf
+++ b/tests/acceptance/01_vars/02_functions/maplist.cf
@@ -15,6 +15,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "testlist" slist => { "zero", "two", "three's", "four-fore:quatre", "last" };
       "empty" slist => { };
diff --git a/tests/acceptance/01_vars/02_functions/mergedata-json-strings.cf b/tests/acceptance/01_vars/02_functions/mergedata-json-strings.cf
index 1cedd35a62..ef2557ad1c 100644
--- a/tests/acceptance/01_vars/02_functions/mergedata-json-strings.cf
+++ b/tests/acceptance/01_vars/02_functions/mergedata-json-strings.cf
@@ -12,6 +12,8 @@ bundle agent test
   meta:
       "description"
         string => "Test that plain json strings can be merged";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
 
    vars:
      "merged" data => mergedata( '[]', '{ "one": "1" }', '{ "two":"2"}' );
diff --git a/tests/acceptance/01_vars/02_functions/network/url_get.cf b/tests/acceptance/01_vars/02_functions/network/url_get.cf
index 35f6535f98..d00d8d410c 100644
--- a/tests/acceptance/01_vars/02_functions/network/url_get.cf
+++ b/tests/acceptance/01_vars/02_functions/network/url_get.cf
@@ -35,6 +35,8 @@ bundle agent test
 {
   meta:
       "test_skip_unsupported" string => "!feature_curl";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
 
   vars:
       "kept" data => mergedata(
diff --git a/tests/acceptance/01_vars/02_functions/nth_datacontainer.cf b/tests/acceptance/01_vars/02_functions/nth_datacontainer.cf
index 86db569bcb..0c2d3f7ac2 100644
--- a/tests/acceptance/01_vars/02_functions/nth_datacontainer.cf
+++ b/tests/acceptance/01_vars/02_functions/nth_datacontainer.cf
@@ -24,8 +24,11 @@ bundle agent init
 
 bundle common test_common
 {
-  vars:
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
 
+  vars:
       "data"    data   => readjson("$(this.promise_filename).json", "100k");
       "datastr" string => format("%S", data);
 
diff --git a/tests/acceptance/01_vars/02_functions/readdata.cf b/tests/acceptance/01_vars/02_functions/readdata.cf
index 588d2369b9..0485a19ea7 100644
--- a/tests/acceptance/01_vars/02_functions/readdata.cf
+++ b/tests/acceptance/01_vars/02_functions/readdata.cf
@@ -15,6 +15,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10252" };
+
   vars:
       "explicit_csv" data => readdata("$(this.promise_filename).csv", "CSV");
       "explicit_env" data => readdata("$(this.promise_filename).env", "ENV");
diff --git a/tests/acceptance/01_vars/02_functions/readdata_yaml.cf b/tests/acceptance/01_vars/02_functions/readdata_yaml.cf
index 25c1e5df00..712cd8ae41 100644
--- a/tests/acceptance/01_vars/02_functions/readdata_yaml.cf
+++ b/tests/acceptance/01_vars/02_functions/readdata_yaml.cf
@@ -15,6 +15,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
     feature_yaml::
       "explicit_yaml" data => readdata("$(this.promise_filename).yaml", "YAML");
diff --git a/tests/acceptance/01_vars/02_functions/regex_replace.cf b/tests/acceptance/01_vars/02_functions/regex_replace.cf
index aacfc4bd7d..b08d5cfbc9 100644
--- a/tests/acceptance/01_vars/02_functions/regex_replace.cf
+++ b/tests/acceptance/01_vars/02_functions/regex_replace.cf
@@ -15,6 +15,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "test" string => "abcdefghij";
 
diff --git a/tests/acceptance/01_vars/02_functions/reverse.cf b/tests/acceptance/01_vars/02_functions/reverse.cf
index 88fb5fe040..dde4e97a6a 100644
--- a/tests/acceptance/01_vars/02_functions/reverse.cf
+++ b/tests/acceptance/01_vars/02_functions/reverse.cf
@@ -24,6 +24,10 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "sa" slist => reverse("init.a");
       "sb" slist => reverse("init.b");
diff --git a/tests/acceptance/01_vars/02_functions/setop_unique_difference_intersection.cf b/tests/acceptance/01_vars/02_functions/setop_unique_difference_intersection.cf
index 815ac9e40d..ed265b78c4 100644
--- a/tests/acceptance/01_vars/02_functions/setop_unique_difference_intersection.cf
+++ b/tests/acceptance/01_vars/02_functions/setop_unique_difference_intersection.cf
@@ -34,6 +34,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
   vars:
       "list1" slist => { "a", "b", "c", "d", "e", "f" };
       "list2" slist => { "a", "b", "c", "d", "e", "f" };
diff --git a/tests/acceptance/01_vars/02_functions/shuffle-exact.cf b/tests/acceptance/01_vars/02_functions/shuffle-exact.cf
index a2c9b921b2..bc54c104f2 100644
--- a/tests/acceptance/01_vars/02_functions/shuffle-exact.cf
+++ b/tests/acceptance/01_vars/02_functions/shuffle-exact.cf
@@ -32,8 +32,8 @@ bundle agent test
       # for some reason, shuffle() produces different results on 64bit RHEL 4
       # and Debian 4 than everywhere else
       "test_soft_fail"
-        string => "(centos_4|centos_5|debian_4).64_bit",
-        meta => { "CFE-2301" };
+        string => "((centos_4|centos_5|debian_4).64_bit)|windows",
+        meta => { "CFE-2301,ENT-10254" };
   vars:
       "lists" slist => { "a", "b" };
       "seeds" slist => { "skruf", "cormorant", "dollhouse" };
diff --git a/tests/acceptance/01_vars/02_functions/sort.cf b/tests/acceptance/01_vars/02_functions/sort.cf
index ebf2e48339..ae10bb3c4b 100644
--- a/tests/acceptance/01_vars/02_functions/sort.cf
+++ b/tests/acceptance/01_vars/02_functions/sort.cf
@@ -61,8 +61,10 @@ bundle agent init
 bundle agent test
 {
   meta:
-      "test_soft_fail" string => "hpux|sunos_5_9|windows",
+      "test_soft_fail" string => "hpux|sunos_5_9",
         meta => { "redmine4934", "redmine5107" };
+      "test_flakey_fail" string => "windows",
+        meta => { "ENT-10254" };
 
 
   vars:
diff --git a/tests/acceptance/01_vars/02_functions/storejson.cf b/tests/acceptance/01_vars/02_functions/storejson.cf
index 70375aee4d..6574b38220 100644
--- a/tests/acceptance/01_vars/02_functions/storejson.cf
+++ b/tests/acceptance/01_vars/02_functions/storejson.cf
@@ -9,6 +9,9 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
   vars:
       "mylist" slist => { "x", "y" };
       "data" data => parsejson('{
diff --git a/tests/acceptance/01_vars/02_functions/storejson_edge_case.cf b/tests/acceptance/01_vars/02_functions/storejson_edge_case.cf
index ef12c462b0..d209fc3d29 100644
--- a/tests/acceptance/01_vars/02_functions/storejson_edge_case.cf
+++ b/tests/acceptance/01_vars/02_functions/storejson_edge_case.cf
@@ -10,6 +10,9 @@ body common control
 ##########################################################
 
 bundle agent test {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
   vars:
       "data" string => storejson('{ "A very long text": "Hello, everyone! This is the LONGEST TEXT EVER! I was inspired by the various other longest texts ever on the internet, and I wanted to make my own. So here it is! This is going to be a WORLD RECORD! This is actually my third attempt at doing this. The first time, I didnt save it. The second time, the Neocities editor crashed. Now Im writing this in Notepad, then copying it into the Neocities editor instead of typing it directly in the Neocities editor to avoid crashing. It sucks that my past two attempts are gone now. Those actually got pretty long. Not the longest, but still pretty long. I hope this one wont get lost somehow. Anyways, lets talk about WAFFLES! I like waffles. Waffles are cool. Waffles is a funny word. Theres a Teen Titans Go episode called Waffles where the word Waffles is said a hundred-something times. Its pretty annoying. Theres also a Teen Titans Go episode about Pig Latin. Dont know what Pig Latin is? Its a language where you take all the consonants before the first vowel, move them to the end, and add -ay to the end. If the word begins with a vowel, you just add -way to the end. For example, Waffles becomes Afflesway. Ive been speaking Pig Latin fluently since the fourth grade, so it surprised me when I saw the episode for the first time. I speak Pig Latin with my sister sometimes. Its pretty fun. I like speaking it in public so that everyone around us gets confused. Thats never actually happened before, but if it ever does, twill be pretty funny. By the way, twill is a word I invented recently, and its a contraction of it will. I really hope it gains popularity in the near future, because twill is WAY more fun than saying itll. Itll is too boring. Nobody likes boring. This is nowhere near being the longest text ever, but eventually it will be! I might still be writing this a decade later, who knows? But right now, its not very long. But Ill just keep writing until it is the longest! Have you ever heard the song Dau Dau by Awesome Scampis? Its an amazing song. Look it up on YouTube! I play that song all the time around my sister! It drives her crazy, and I love it. Another way I like driving my sister crazy is by speaking my own made up language to her. She hates the languages I make! The only language that we both speak besides English is Pig Latin. I think you already knew that. Whatever. I think Im gonna go for now. Bye! Hi, Im back now. Im gonna contribute more to this soon-to-be giant wall of text. I just realised I have a giant stuffed frog on my bed. I forgot his name. Im pretty sure it was something stupid though. I think it was FROG in Morse Code or something. Morse Code is cool. I know a bit of it, but Im not very good at it. Im also not very good at French. I barely know anything in French, and my pronunciation probably sucks. But Im learning it, at least. Im also learning Esperanto. Its this language that was made up by some guy a long time ago to be the universal language. A lot of people speak it. I am such a language nerd. Half of this text is probably gonna be about languages. But hey, as long as its long! Ha, get it? As LONG as its LONG? Im so funny, right? No, Im not. I should probably get some sleep. Goodnight! Hello, Im back again. I basically have only two interests nowadays: languages and furries. What? Oh, sorry, I thought you knew I was a furry. Haha, oops. Anyway, yeah, Im a furry, but since Im a young furry, I cant really do as much as I would like to do in the fandom. When Im older, I would like to have a fursuit, go to furry conventions, all that stuff. But for now I can only dream of that. Sorry you had to deal with me talking about furries, but Im honestly very desperate for this to be the longest text ever. Last night I was watching nothing but fursuit unboxings. I think I need help. This one time, me and my mom were going to go to a furry Christmas party, but we didnt end up going because of the fact that there was alcohol on the premises, and that she didnt wanna have to be a mom dragging her son through a crowd of furries. Both of those reasons were understandable. Okay, hopefully I wont have to talk about furries anymore. I dont care if youre a furry reading this right now, I just dont wanna have to torture everyone else."}');
 }
diff --git a/tests/acceptance/01_vars/02_functions/strftime.cf b/tests/acceptance/01_vars/02_functions/strftime.cf
index e4ec61da24..0beb211a2e 100644
--- a/tests/acceptance/01_vars/02_functions/strftime.cf
+++ b/tests/acceptance/01_vars/02_functions/strftime.cf
@@ -50,6 +50,10 @@ bundle edit_line init_insert
 
 bundle agent test
 {
+    meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10253" };
+
   vars:
       "vals" slist => {
                         strftime('gmtime', '%F %T', 100000000),
diff --git a/tests/acceptance/01_vars/02_functions/string_mustache.cf b/tests/acceptance/01_vars/02_functions/string_mustache.cf
index 0ac07f76a5..e966c5b1fb 100644
--- a/tests/acceptance/01_vars/02_functions/string_mustache.cf
+++ b/tests/acceptance/01_vars/02_functions/string_mustache.cf
@@ -14,6 +14,10 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "out11" string => string_mustache("desert = {{vars.init.desert}}");
 
diff --git a/tests/acceptance/01_vars/02_functions/string_replace.cf b/tests/acceptance/01_vars/02_functions/string_replace.cf
index c3caf164ca..220de85782 100644
--- a/tests/acceptance/01_vars/02_functions/string_replace.cf
+++ b/tests/acceptance/01_vars/02_functions/string_replace.cf
@@ -16,6 +16,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "test" string => "abcdefghij\t\n";
       "test2" string => "(){}[].*?";
diff --git a/tests/acceptance/01_vars/02_functions/string_trim.cf b/tests/acceptance/01_vars/02_functions/string_trim.cf
index 13b46a3a2d..c361445814 100644
--- a/tests/acceptance/01_vars/02_functions/string_trim.cf
+++ b/tests/acceptance/01_vars/02_functions/string_trim.cf
@@ -9,6 +9,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "abcd1" string => string_trim("abcd");
       "abcd2" string => string_trim(" abcd");
diff --git a/tests/acceptance/01_vars/02_functions/sublist.cf b/tests/acceptance/01_vars/02_functions/sublist.cf
index af137477c7..2fe5a4bc63 100644
--- a/tests/acceptance/01_vars/02_functions/sublist.cf
+++ b/tests/acceptance/01_vars/02_functions/sublist.cf
@@ -15,6 +15,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "test" slist => {
                         1,2,3,
diff --git a/tests/acceptance/01_vars/02_functions/sum_and_product.cf b/tests/acceptance/01_vars/02_functions/sum_and_product.cf
index 86ccbc32b4..3807b376ac 100644
--- a/tests/acceptance/01_vars/02_functions/sum_and_product.cf
+++ b/tests/acceptance/01_vars/02_functions/sum_and_product.cf
@@ -21,6 +21,10 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "normal_list" slist => { "1", "2", "3" };
       "empty_list" slist => { };
diff --git a/tests/acceptance/01_vars/02_functions/text_xform.cf b/tests/acceptance/01_vars/02_functions/text_xform.cf
index 191dfb166b..9d31b3c30c 100644
--- a/tests/acceptance/01_vars/02_functions/text_xform.cf
+++ b/tests/acceptance/01_vars/02_functions/text_xform.cf
@@ -7,6 +7,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "tests" slist => { "q1", "q2", "q3", "q4" };
       "offsets" ilist => { "-1", "-2", "-5", "-10", "-20", "-26", "-27", "-28", "-10240",
diff --git a/tests/acceptance/01_vars/02_functions/type.cf b/tests/acceptance/01_vars/02_functions/type.cf
index 4326d3cfa1..1aea1a7746 100644
--- a/tests/acceptance/01_vars/02_functions/type.cf
+++ b/tests/acceptance/01_vars/02_functions/type.cf
@@ -32,6 +32,8 @@ bundle agent test
   meta:
       "description" -> { "CFE-2240" }
         string => "Test for expected results from policy function type";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
 
   vars:
       "test_00" string => type("init._data");
diff --git a/tests/acceptance/01_vars/02_functions/url_get_local.cf b/tests/acceptance/01_vars/02_functions/url_get_local.cf
index 9c2dcb2ae1..907c00bffe 100644
--- a/tests/acceptance/01_vars/02_functions/url_get_local.cf
+++ b/tests/acceptance/01_vars/02_functions/url_get_local.cf
@@ -33,6 +33,8 @@ bundle agent test
 {
   meta:
       "test_skip_unsupported" string => "!feature_curl";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
 
   vars:
       "kept" data => mergedata(
diff --git a/tests/acceptance/01_vars/02_functions/validdata.cf b/tests/acceptance/01_vars/02_functions/validdata.cf
index c25d3d0b8f..f2d134ca99 100644
--- a/tests/acceptance/01_vars/02_functions/validdata.cf
+++ b/tests/acceptance/01_vars/02_functions/validdata.cf
@@ -15,6 +15,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
     "valid_json" string => "should appear",
       if => validdata(readfile("$(this.promise_filename).json", inf), "JSON");
diff --git a/tests/acceptance/01_vars/02_functions/validjson_trailing_bogus_data.cf b/tests/acceptance/01_vars/02_functions/validjson_trailing_bogus_data.cf
index fda15ae3df..e1f6686f0e 100644
--- a/tests/acceptance/01_vars/02_functions/validjson_trailing_bogus_data.cf
+++ b/tests/acceptance/01_vars/02_functions/validjson_trailing_bogus_data.cf
@@ -18,6 +18,8 @@ bundle agent test
   meta:
       "description" -> { "CFE-4080" }
         string => "Test validjson() with trailing bogus data";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
 }
 
 ##############################################################################
diff --git a/tests/acceptance/01_vars/02_functions/variablesmatching.cf b/tests/acceptance/01_vars/02_functions/variablesmatching.cf
index 074513b4ab..0aa93783d7 100644
--- a/tests/acceptance/01_vars/02_functions/variablesmatching.cf
+++ b/tests/acceptance/01_vars/02_functions/variablesmatching.cf
@@ -22,6 +22,10 @@ bundle common init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "vars" slist => variablesmatching("default:init.test_fbeae67f3e347b5e0032302200141131.*");
       "x_vars" slist => variablesmatching("default:init.test_fbeae67f3e347b5e0032302200141131.*", "x");
diff --git a/tests/acceptance/01_vars/02_functions/wrap_container_fncalls.cf b/tests/acceptance/01_vars/02_functions/wrap_container_fncalls.cf
index 5d1c24392e..feebc3b298 100644
--- a/tests/acceptance/01_vars/02_functions/wrap_container_fncalls.cf
+++ b/tests/acceptance/01_vars/02_functions/wrap_container_fncalls.cf
@@ -19,6 +19,10 @@ bundle common init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "base_list" slist => { "a", "b", "c", "aaa", "bbb", "ccc" };
       "base_data" data => '{ "x": 100, "y": "z"  }';
diff --git a/tests/acceptance/01_vars/04_containers/inline_json.cf b/tests/acceptance/01_vars/04_containers/inline_json.cf
index 40287b0188..be6e57d68e 100644
--- a/tests/acceptance/01_vars/04_containers/inline_json.cf
+++ b/tests/acceptance/01_vars/04_containers/inline_json.cf
@@ -15,6 +15,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "included" string => "( included text )";
       "options1" data => '
diff --git a/tests/acceptance/01_vars/04_containers/inline_yaml.cf b/tests/acceptance/01_vars/04_containers/inline_yaml.cf
index 7d518a5db3..f087ef9cda 100644
--- a/tests/acceptance/01_vars/04_containers/inline_yaml.cf
+++ b/tests/acceptance/01_vars/04_containers/inline_yaml.cf
@@ -15,6 +15,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
     feature_yaml::
       "included" string => "( included text )";
diff --git a/tests/acceptance/01_vars/04_containers/iterate_over_data_array.cf b/tests/acceptance/01_vars/04_containers/iterate_over_data_array.cf
index dde9ecac55..5f80261932 100644
--- a/tests/acceptance/01_vars/04_containers/iterate_over_data_array.cf
+++ b/tests/acceptance/01_vars/04_containers/iterate_over_data_array.cf
@@ -20,6 +20,8 @@ bundle agent test
         string => "Test that we can iterate over an array inside of
         a data container without first extracting it. And that the order of
         iteration is preserved.";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
 
   vars:
     "data3" data => '{ "iteration_order":[ "b", "c", "a" ], "b":{ "key": "bkeyval" }, "c":{"key":"ckeyval"}, "a":{"key":"akeyval"}}';
diff --git a/tests/acceptance/01_vars/deep_delayed_expansion/main.cf b/tests/acceptance/01_vars/deep_delayed_expansion/main.cf
index 3f134b4c31..86f99bcbe2 100644
--- a/tests/acceptance/01_vars/deep_delayed_expansion/main.cf
+++ b/tests/acceptance/01_vars/deep_delayed_expansion/main.cf
@@ -8,6 +8,8 @@ bundle agent test
 {
   meta:
     "description" string => "Test that variables containing other variales are de-referenced";
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10256" };
 }
 
 bundle agent check
diff --git a/tests/acceptance/02_classes/01_basic/from_json_booleans.cf b/tests/acceptance/02_classes/01_basic/from_json_booleans.cf
index c9db5ed37f..9d16d94888 100644
--- a/tests/acceptance/02_classes/01_basic/from_json_booleans.cf
+++ b/tests/acceptance/02_classes/01_basic/from_json_booleans.cf
@@ -15,6 +15,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   classes:
       "canary" expression => "any", meta => { "collect" }; # just a baseline test
       "from_$(json)" expression => "$(json)", meta => { "collect" }; # iterates through non-nulls
diff --git a/tests/acceptance/02_classes/01_basic/variable_class_expressions_with_if.cf b/tests/acceptance/02_classes/01_basic/variable_class_expressions_with_if.cf
index 6015526242..d22cc90389 100644
--- a/tests/acceptance/02_classes/01_basic/variable_class_expressions_with_if.cf
+++ b/tests/acceptance/02_classes/01_basic/variable_class_expressions_with_if.cf
@@ -71,7 +71,7 @@ bundle agent test
 
   commands:
 
-     "/bin/true"
+     "$(G.true)"
        handle => "delay",
        comment => "This is a benign promise that is used to delay detection of
                    failure classes until after normal order begins.";
diff --git a/tests/acceptance/02_classes/02_functions/iprange.cf b/tests/acceptance/02_classes/02_functions/iprange.cf
index fdc991f68c..f95c30188f 100644
--- a/tests/acceptance/02_classes/02_functions/iprange.cf
+++ b/tests/acceptance/02_classes/02_functions/iprange.cf
@@ -15,6 +15,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   classes:
       "expected_missing" expression => iprange("8.8.8.8/31"),
         meta => { "collect" };
diff --git a/tests/acceptance/02_classes/02_functions/isipinsubnet.cf b/tests/acceptance/02_classes/02_functions/isipinsubnet.cf
index 6cff4f4db0..2d89d0619b 100644
--- a/tests/acceptance/02_classes/02_functions/isipinsubnet.cf
+++ b/tests/acceptance/02_classes/02_functions/isipinsubnet.cf
@@ -15,6 +15,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   classes:
       "zeroes_range_match" expression => isipinsubnet("0.0.0.0/0", "1.2.3.4"),
         meta => { "collect" };
diff --git a/tests/acceptance/02_classes/03_os/powershell.cf b/tests/acceptance/02_classes/03_os/powershell.cf
index be2c89d6d7..9599a3b818 100644
--- a/tests/acceptance/02_classes/03_os/powershell.cf
+++ b/tests/acceptance/02_classes/03_os/powershell.cf
@@ -23,6 +23,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
   vars:
       "dummy" string => "dummy";
 }
diff --git a/tests/acceptance/05_processes/01_matching/inverse_ttime_inverse_found.cf b/tests/acceptance/05_processes/01_matching/inverse_ttime_inverse_found.cf
index f7896b9e47..49a79b08c0 100644
--- a/tests/acceptance/05_processes/01_matching/inverse_ttime_inverse_found.cf
+++ b/tests/acceptance/05_processes/01_matching/inverse_ttime_inverse_found.cf
@@ -25,9 +25,6 @@ bundle agent init
 bundle agent test
 {
   meta:
-      "test_suppress_fail" string => "windows",
-        meta => { "redmine4747" };
-
       "test_flakey_fail" string => "aix_7_1",
         meta => { "CFE-3313" };
 
diff --git a/tests/acceptance/05_processes/01_matching/owner.cf b/tests/acceptance/05_processes/01_matching/owner.cf
index 7ea23b8123..c0b842c747 100644
--- a/tests/acceptance/05_processes/01_matching/owner.cf
+++ b/tests/acceptance/05_processes/01_matching/owner.cf
@@ -24,6 +24,10 @@ bundle agent init
 
 bundle agent test
 {
+    meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10217" };
+
   vars:
       "ok_list" slist => {
         "pass_root_1", "pass_root_2", "pass_nouser_3", "pass_nouser_4",
diff --git a/tests/acceptance/05_processes/01_matching/process_select_fncalls.cf b/tests/acceptance/05_processes/01_matching/process_select_fncalls.cf
index b1dc7c9697..6815f2028c 100644
--- a/tests/acceptance/05_processes/01_matching/process_select_fncalls.cf
+++ b/tests/acceptance/05_processes/01_matching/process_select_fncalls.cf
@@ -12,6 +12,9 @@ bundle agent test
   meta:
       "description" -> { "CFE-1968" }
         string => "Test that process_select body can have (failing) function calls";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10217" };
+
   vars:
     "canonified_uid"
         string => canonify(getuid("nosuchuser"));
diff --git a/tests/acceptance/05_processes/01_matching/timed/stime.cf b/tests/acceptance/05_processes/01_matching/timed/stime.cf
index fb6e3bd741..e1d0af8854 100644
--- a/tests/acceptance/05_processes/01_matching/timed/stime.cf
+++ b/tests/acceptance/05_processes/01_matching/timed/stime.cf
@@ -12,6 +12,8 @@ bundle agent init
       # Adding the test case revealed that these platforms do not work, but we
       # don't know why.
       "test_skip_needs_work" string => "solaris|hpux";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
 
   vars:
       # Random, but unique string for this test case.
diff --git a/tests/acceptance/05_processes/process_stop.cf b/tests/acceptance/05_processes/process_stop.cf
index 9094a44d48..b4935cbd01 100644
--- a/tests/acceptance/05_processes/process_stop.cf
+++ b/tests/acceptance/05_processes/process_stop.cf
@@ -9,6 +9,8 @@ bundle agent test
   meta:
       "description" -> { "ENT-4988" }
         string => "Test some basic expectations when using process_stop in processes type promises";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
 
   processes:
 
diff --git a/tests/acceptance/07_packages/001.cf b/tests/acceptance/07_packages/001.cf
index b35e0228d3..a0a1e55c04 100644
--- a/tests/acceptance/07_packages/001.cf
+++ b/tests/acceptance/07_packages/001.cf
@@ -39,6 +39,10 @@ bundle agent init
 
 bundle agent test
 {
+    meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "name" string => "imagisoft";
       "version" string => "1.0i";
diff --git a/tests/acceptance/07_packages/002.cf b/tests/acceptance/07_packages/002.cf
index 3b6cc4fd54..983f5eb156 100644
--- a/tests/acceptance/07_packages/002.cf
+++ b/tests/acceptance/07_packages/002.cf
@@ -39,6 +39,10 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "name" string => "imagisoft";
       "version" string => "1.0i";
diff --git a/tests/acceptance/07_packages/003.cf b/tests/acceptance/07_packages/003.cf
index c8cd82da4f..1497178bdb 100644
--- a/tests/acceptance/07_packages/003.cf
+++ b/tests/acceptance/07_packages/003.cf
@@ -39,6 +39,10 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "name" string => "imagisoft";
 
diff --git a/tests/acceptance/07_packages/004.cf b/tests/acceptance/07_packages/004.cf
index 31adeeb8b9..4baf261f30 100644
--- a/tests/acceptance/07_packages/004.cf
+++ b/tests/acceptance/07_packages/004.cf
@@ -41,6 +41,10 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "name" string => "imagisoft";
 
diff --git a/tests/acceptance/07_packages/005.cf b/tests/acceptance/07_packages/005.cf
index 48720bab52..9147b167d2 100644
--- a/tests/acceptance/07_packages/005.cf
+++ b/tests/acceptance/07_packages/005.cf
@@ -41,6 +41,10 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "name" string => "imagisoft";
 
diff --git a/tests/acceptance/07_packages/006.cf b/tests/acceptance/07_packages/006.cf
index fc86899025..8d171f03fc 100644
--- a/tests/acceptance/07_packages/006.cf
+++ b/tests/acceptance/07_packages/006.cf
@@ -41,6 +41,10 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "name" string => "imagisoft";
 
diff --git a/tests/acceptance/07_packages/package_module_interpreter.cf b/tests/acceptance/07_packages/package_module_interpreter.cf
index 64b80a68a9..86ef4c5259 100644
--- a/tests/acceptance/07_packages/package_module_interpreter.cf
+++ b/tests/acceptance/07_packages/package_module_interpreter.cf
@@ -20,7 +20,7 @@ body package_module test_module
     query_installed_ifelapsed => "60";
     query_updates_ifelapsed => "14400";
     default_options => { "$(G.testfile)" };
-    interpreter => "/bin/sh";   # NOTE: no hashbang in the test_module script
+    interpreter => "$(G.sh)";   # /bin/sh; NOTE: no hashbang in the test_module script
 }
 
 bundle agent test
@@ -29,6 +29,8 @@ bundle agent test
       "description"
         string => "Test that the interpreter for the package module script can be set",
         meta => { "CFE-2880" };
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
 
   packages:
       "first_pkg"
diff --git a/tests/acceptance/07_packages/package_module_path.cf b/tests/acceptance/07_packages/package_module_path.cf
index 7b5e082c83..7590bd64fb 100644
--- a/tests/acceptance/07_packages/package_module_path.cf
+++ b/tests/acceptance/07_packages/package_module_path.cf
@@ -30,6 +30,8 @@ bundle agent test
       "description"
         string => "Test that the interpreter for the package module script can be set",
         meta => { "CFE-2880" };
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10217" };
 
   packages:
       "first_pkg"
diff --git a/tests/acceptance/08_commands/01_modules/module-array-allows-at.cf b/tests/acceptance/08_commands/01_modules/module-array-allows-at.cf
index 88cad6a819..d3fa859c39 100644
--- a/tests/acceptance/08_commands/01_modules/module-array-allows-at.cf
+++ b/tests/acceptance/08_commands/01_modules/module-array-allows-at.cf
@@ -10,6 +10,8 @@ bundle agent test
   meta:
       "description" -> { "CFE-3099" }
         string => "Test that arrays defined by modules can contain @ just like classic arrays.";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
 
   commands:
 
diff --git a/tests/acceptance/08_commands/01_modules/module-array-allows-slash.cf b/tests/acceptance/08_commands/01_modules/module-array-allows-slash.cf
index 2c3283b369..dfe1a565ed 100644
--- a/tests/acceptance/08_commands/01_modules/module-array-allows-slash.cf
+++ b/tests/acceptance/08_commands/01_modules/module-array-allows-slash.cf
@@ -10,6 +10,8 @@ bundle agent test
   meta:
       "description" -> { "CFE-2768" }
         string => "Test that arrays defined by modules can contain slashes just like classic arrays.";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
 
   commands:
 
diff --git a/tests/acceptance/08_commands/01_modules/module-array-indexing.cf b/tests/acceptance/08_commands/01_modules/module-array-indexing.cf
index 7af352dc1e..9082c2e564 100644
--- a/tests/acceptance/08_commands/01_modules/module-array-indexing.cf
+++ b/tests/acceptance/08_commands/01_modules/module-array-indexing.cf
@@ -14,9 +14,6 @@ body common control
 
 bundle agent test
 {
-  meta:
-      "test_suppress_fail" string => "windows";
-
   commands:
       "$(G.cat) $(this.promise_filename).txt" module => "true";
 
diff --git a/tests/acceptance/08_commands/01_modules/module_file_test.cf b/tests/acceptance/08_commands/01_modules/module_file_test.cf
index 955f868a1c..958dd7868e 100644
--- a/tests/acceptance/08_commands/01_modules/module_file_test.cf
+++ b/tests/acceptance/08_commands/01_modules/module_file_test.cf
@@ -26,6 +26,8 @@ bundle agent test
   meta:
       "description"
         string => "Test module file protocol";
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
 
   commands:
     any::
diff --git a/tests/acceptance/08_commands/01_modules/set-persistent-class.cf b/tests/acceptance/08_commands/01_modules/set-persistent-class.cf
index e3c5b0b0fe..07de575b34 100644
--- a/tests/acceptance/08_commands/01_modules/set-persistent-class.cf
+++ b/tests/acceptance/08_commands/01_modules/set-persistent-class.cf
@@ -12,6 +12,13 @@ body common control
         version => "1.0";
 }
 
+bundle agent test
+{
+    meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
+}
+
 bundle agent check
 {
   vars:
diff --git a/tests/acceptance/08_commands/01_modules/set-tags.cf b/tests/acceptance/08_commands/01_modules/set-tags.cf
index 6d59cbb3da..530c1c84d4 100644
--- a/tests/acceptance/08_commands/01_modules/set-tags.cf
+++ b/tests/acceptance/08_commands/01_modules/set-tags.cf
@@ -24,6 +24,9 @@ bundle common init
 
 bundle agent test
 {
+  meta:
+      "test_flakey_fail" string => "windows",
+        meta => { "ENT-10257" };
   commands:
       "$(G.cat) $(init.script_name)"
         contain => in_shell,
diff --git a/tests/acceptance/08_commands/01_modules/vars-from-module-have-source-and-derived_from-tags.cf b/tests/acceptance/08_commands/01_modules/vars-from-module-have-source-and-derived_from-tags.cf
index 090efade28..79746b5d24 100644
--- a/tests/acceptance/08_commands/01_modules/vars-from-module-have-source-and-derived_from-tags.cf
+++ b/tests/acceptance/08_commands/01_modules/vars-from-module-have-source-and-derived_from-tags.cf
@@ -11,8 +11,9 @@ bundle agent test
       "description" -> { "ENT-7725" }
         string => "Test that vars defined by modules without explicit tags still have automatic tags identifying the source";
 
-      "test_skip_unsupported"
+      "test_soft_fail"
         string => "windows",
+        meta => { "ENT-10217" },
         comment => "The subtest policy uses /bin/echo";
 
   commands:
diff --git a/tests/acceptance/08_commands/02_syntax/arglist.cf b/tests/acceptance/08_commands/02_syntax/arglist.cf
index 0417377bea..7ac630f5fb 100644
--- a/tests/acceptance/08_commands/02_syntax/arglist.cf
+++ b/tests/acceptance/08_commands/02_syntax/arglist.cf
@@ -15,6 +15,9 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
   commands:
       "$(G.echo)" arglist => { "=abc=2'3\"4" }, module => "true";
       # this will generate the command `echo =def=567 =ghi=8'9"a`
diff --git a/tests/acceptance/08_commands/03_shells/shelltypes.cf b/tests/acceptance/08_commands/03_shells/shelltypes.cf
index 28ef5f2187..2e5f28255a 100644
--- a/tests/acceptance/08_commands/03_shells/shelltypes.cf
+++ b/tests/acceptance/08_commands/03_shells/shelltypes.cf
@@ -34,6 +34,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
   classes:
       "$(init.shelltypes)" expression => regcmp(".*(Succeeded|Powershell is only supported on Windows).*", execresult("$(sys.cf_agent) -D $(init.shelltypes) -Kf $(init.origtestdir)$(const.dirsep)tryshell.cf.sub", "noshell"));
 
diff --git a/tests/acceptance/09_services/outcomes.cf b/tests/acceptance/09_services/outcomes.cf
index 5ae95e23ef..fca336d67a 100644
--- a/tests/acceptance/09_services/outcomes.cf
+++ b/tests/acceptance/09_services/outcomes.cf
@@ -6,6 +6,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-2161" };
+
   vars:
       "services" slist => { "single" };
       "policies" slist => { "enable", "disable", "start", "stop", "restart", "reload", "custom" };
diff --git a/tests/acceptance/09_services/reload.cf b/tests/acceptance/09_services/reload.cf
index 968ddb764e..ec3b6f7dbf 100644
--- a/tests/acceptance/09_services/reload.cf
+++ b/tests/acceptance/09_services/reload.cf
@@ -25,7 +25,7 @@ bundle agent test
 {
   meta:
       "test_suppress_fail" string => "windows",
-        meta => { "redmine4772" };
+        meta => { "redmine4772,ENT-2161" };
 
   services:
       "myservice"
diff --git a/tests/acceptance/09_services/restart.cf b/tests/acceptance/09_services/restart.cf
index c479139d96..77ef03eed8 100644
--- a/tests/acceptance/09_services/restart.cf
+++ b/tests/acceptance/09_services/restart.cf
@@ -25,7 +25,7 @@ bundle agent test
 {
   meta:
       "test_suppress_fail" string => "windows",
-        meta => { "redmine4772" };
+        meta => { "redmine4772,ENT-2161" };
 
   services:
       "myservice"
diff --git a/tests/acceptance/09_services/service_cannot_be_resolved.cf b/tests/acceptance/09_services/service_cannot_be_resolved.cf
index 0e3a4b5573..4c3f865c1e 100644
--- a/tests/acceptance/09_services/service_cannot_be_resolved.cf
+++ b/tests/acceptance/09_services/service_cannot_be_resolved.cf
@@ -21,7 +21,7 @@ bundle common test
 {
   meta:
       "test_suppress_fail" string => "windows",
-        meta => { "redmine4772" };
+        meta => { "redmine4772,ENT-2161" };
 
   classes:
       "resolution_warning" expression => returnszero("$(command) Service | $(G.grep) 'cannot be resolved' 2>&1", "useshell");
diff --git a/tests/acceptance/09_services/standard_services-from-non-default-namespace.cf b/tests/acceptance/09_services/standard_services-from-non-default-namespace.cf
index 49708a868a..015b0a2ced 100644
--- a/tests/acceptance/09_services/standard_services-from-non-default-namespace.cf
+++ b/tests/acceptance/09_services/standard_services-from-non-default-namespace.cf
@@ -13,6 +13,9 @@ bundle agent test
       "description" -> { "ENT-5406" }
         string => "Test that standard_services can be used from non-default namespace";
 
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-2161" };
+
   methods:
       "Test" usebundle => ENT_5406:ns_test;
 }
diff --git a/tests/acceptance/09_services/start.cf b/tests/acceptance/09_services/start.cf
index 8b9df08b53..aa75db174b 100644
--- a/tests/acceptance/09_services/start.cf
+++ b/tests/acceptance/09_services/start.cf
@@ -25,7 +25,7 @@ bundle agent test
 {
   meta:
       "test_suppress_fail" string => "windows",
-        meta => { "redmine4772" };
+        meta => { "redmine4772,ENT-2161" };
 
   services:
       "myservice"
diff --git a/tests/acceptance/09_services/stop.cf b/tests/acceptance/09_services/stop.cf
index 8b3608fa3d..2ad8c80c55 100644
--- a/tests/acceptance/09_services/stop.cf
+++ b/tests/acceptance/09_services/stop.cf
@@ -25,7 +25,7 @@ bundle agent test
 {
   meta:
       "test_suppress_fail" string => "windows",
-        meta => { "redmine4772" };
+        meta => { "redmine4772,ENT-2161" };
 
   services:
       "myservice"
diff --git a/tests/acceptance/10_files/01_create/cfengine_create_by_default.cf b/tests/acceptance/10_files/01_create/cfengine_create_by_default.cf
index d1c57eca62..7c0ac6e174 100644
--- a/tests/acceptance/10_files/01_create/cfengine_create_by_default.cf
+++ b/tests/acceptance/10_files/01_create/cfengine_create_by_default.cf
@@ -48,6 +48,9 @@ bundle agent test
       "description" -> { "CFE-3955" }
         string => "template_method cfengine creates promiser by default";
 
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
+
   files:
     # File should be created by default and rendered with content
       "$(G.testfile).test_1"
diff --git a/tests/acceptance/10_files/01_create/perms-mode.cf b/tests/acceptance/10_files/01_create/perms-mode.cf
index 5cd6205cfa..d86cdb8594 100644
--- a/tests/acceptance/10_files/01_create/perms-mode.cf
+++ b/tests/acceptance/10_files/01_create/perms-mode.cf
@@ -15,6 +15,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
+
   vars:
     freebsd|solaris::
       "modes" slist => { "1", "333", "100", "200", "777", "o=x", "ugo=wx", "u=x", "u=w", "ugo=rwx" };
diff --git a/tests/acceptance/10_files/02_maintain/016.cf b/tests/acceptance/10_files/02_maintain/016.cf
index 2c8c6ee3bf..3bacebe06d 100644
--- a/tests/acceptance/10_files/02_maintain/016.cf
+++ b/tests/acceptance/10_files/02_maintain/016.cf
@@ -35,6 +35,10 @@ body contain shell
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
+
   files:
       "$(G.testdir)/destfile"
       copy_from => cp_2_file("$(G.testdir)/afile");
diff --git a/tests/acceptance/10_files/02_maintain/changes_depth_search.cf b/tests/acceptance/10_files/02_maintain/changes_depth_search.cf
index 99d4724057..61de4fcd03 100644
--- a/tests/acceptance/10_files/02_maintain/changes_depth_search.cf
+++ b/tests/acceptance/10_files/02_maintain/changes_depth_search.cf
@@ -89,6 +89,10 @@ subfile.same,N,New file found");
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   commands:
       "$(sys.cf_agent) -Dpass1 -Kf $(this.promise_filename).sub";
       "$(sys.cf_agent) -Dpass2 -Kf $(this.promise_filename).sub";
diff --git a/tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf b/tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf
index 3ffb4f8e6e..02b7b474ba 100644
--- a/tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf
+++ b/tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf
@@ -27,6 +27,10 @@ file,R,File removed");
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   commands:
       "$(sys.cf_agent) -Dpass1 -Kf $(this.promise_filename).sub";
       "$(sys.cf_agent) -Dpass2 -Kf $(this.promise_filename).sub";
diff --git a/tests/acceptance/10_files/02_maintain/changes_update_hashes.cf b/tests/acceptance/10_files/02_maintain/changes_update_hashes.cf
index 574c5e2cd7..a2f9479a79 100644
--- a/tests/acceptance/10_files/02_maintain/changes_update_hashes.cf
+++ b/tests/acceptance/10_files/02_maintain/changes_update_hashes.cf
@@ -35,6 +35,10 @@ bundle agent init
 
 bundle agent test
 {
+   meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   files:
       "$(G.testfile).update.updated"
         edit_line => insert_text;
diff --git a/tests/acceptance/10_files/02_maintain/fifos.cf b/tests/acceptance/10_files/02_maintain/fifos.cf
index 7b47bd07e4..7e1fe09ab1 100644
--- a/tests/acceptance/10_files/02_maintain/fifos.cf
+++ b/tests/acceptance/10_files/02_maintain/fifos.cf
@@ -10,9 +10,6 @@ body common control
 
 bundle agent init
 {
-  meta:
-      "test_skip_unsupported" string => "!has_mkfifo";
-
   vars:
       "test_fifo" string => "$(G.testfile).fifo";
 
@@ -22,6 +19,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_skip_unsupported" string => "!has_mkfifo|windows";
+
   files:
       "$(init.test_fifo)"
         create => "false",
diff --git a/tests/acceptance/10_files/04_match/match_scope.cf b/tests/acceptance/10_files/04_match/match_scope.cf
index 146c979c03..5ce45b60fc 100644
--- a/tests/acceptance/10_files/04_match/match_scope.cf
+++ b/tests/acceptance/10_files/04_match/match_scope.cf
@@ -31,6 +31,10 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
+
   vars:
       "foo" string => "foo";
 
diff --git a/tests/acceptance/10_files/08_field_edits/file_content.cf b/tests/acceptance/10_files/08_field_edits/file_content.cf
index 592d23bb80..8f2e9f5978 100644
--- a/tests/acceptance/10_files/08_field_edits/file_content.cf
+++ b/tests/acceptance/10_files/08_field_edits/file_content.cf
@@ -44,6 +44,10 @@ body edit_defaults init_empty
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   files:
       "$(G.testfile).actual.singleline"
         create => "true",
diff --git a/tests/acceptance/10_files/09_insert_lines/block_insert_duplicate.cf b/tests/acceptance/10_files/09_insert_lines/block_insert_duplicate.cf
index 25630e880d..7187a58b34 100644
--- a/tests/acceptance/10_files/09_insert_lines/block_insert_duplicate.cf
+++ b/tests/acceptance/10_files/09_insert_lines/block_insert_duplicate.cf
@@ -43,6 +43,10 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   files:
       "$(G.testfile).actual"
       create => "true",
diff --git a/tests/acceptance/10_files/09_insert_lines/crlf-in-cftemplate.cf b/tests/acceptance/10_files/09_insert_lines/crlf-in-cftemplate.cf
index 681cdecb5c..2df2c6c3a3 100644
--- a/tests/acceptance/10_files/09_insert_lines/crlf-in-cftemplate.cf
+++ b/tests/acceptance/10_files/09_insert_lines/crlf-in-cftemplate.cf
@@ -39,6 +39,10 @@ body copy_from copy_file(file)
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
+
   files:
       "$(G.testdir)/$(init.filelist)"
         edit_template => "$(init.datadir)/$(init.filelist).cftemplate",
diff --git a/tests/acceptance/10_files/09_insert_lines/crlf-in-edit_line-insert-file.cf b/tests/acceptance/10_files/09_insert_lines/crlf-in-edit_line-insert-file.cf
index df014570d6..33b35afad4 100644
--- a/tests/acceptance/10_files/09_insert_lines/crlf-in-edit_line-insert-file.cf
+++ b/tests/acceptance/10_files/09_insert_lines/crlf-in-edit_line-insert-file.cf
@@ -39,6 +39,10 @@ body copy_from copy_file(file)
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
+
   files:
       "$(G.testdir)/$(init.filelist)"
         edit_line => insert_line;
diff --git a/tests/acceptance/10_files/09_insert_lines/crlf-in-edit_line.cf b/tests/acceptance/10_files/09_insert_lines/crlf-in-edit_line.cf
index ba5f8d13a4..4981106520 100644
--- a/tests/acceptance/10_files/09_insert_lines/crlf-in-edit_line.cf
+++ b/tests/acceptance/10_files/09_insert_lines/crlf-in-edit_line.cf
@@ -39,6 +39,10 @@ body copy_from copy_file(file)
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
+
   files:
       "$(G.testdir)/$(init.filelist)"
         edit_line => insert_line;
diff --git a/tests/acceptance/10_files/09_insert_lines/crlf-in-mustache.cf b/tests/acceptance/10_files/09_insert_lines/crlf-in-mustache.cf
index f3a94ab560..cd00b69c5e 100644
--- a/tests/acceptance/10_files/09_insert_lines/crlf-in-mustache.cf
+++ b/tests/acceptance/10_files/09_insert_lines/crlf-in-mustache.cf
@@ -39,6 +39,10 @@ body copy_from copy_file(file)
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
+
   files:
       "$(G.testdir)/$(init.filelist)"
         edit_template => "$(init.datadir)/$(init.filelist).mustache",
diff --git a/tests/acceptance/10_files/09_insert_lines/insert-large-lines.cf b/tests/acceptance/10_files/09_insert_lines/insert-large-lines.cf
index 4f0a600e8d..5ff334e0de 100644
--- a/tests/acceptance/10_files/09_insert_lines/insert-large-lines.cf
+++ b/tests/acceptance/10_files/09_insert_lines/insert-large-lines.cf
@@ -8,6 +8,9 @@ body common control
 
 bundle agent test
 {
+  meta:
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10254" };
   vars:
     "data" string => readfile("$(this.promise_filename).txt", "16431");
   files:
diff --git a/tests/acceptance/10_files/11_xml_edits/build_xpath_001.cf b/tests/acceptance/10_files/11_xml_edits/build_xpath_001.cf
index 3c39ccdc77..f66a8468c8 100644
--- a/tests/acceptance/10_files/11_xml_edits/build_xpath_001.cf
+++ b/tests/acceptance/10_files/11_xml_edits/build_xpath_001.cf
@@ -47,6 +47,10 @@ body edit_defaults init_empty
 #######################################################
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "xpath" string =>
       "/Server/Service/Engine/Host[ @name=\"cfe_host\" | Alias = cfe_alias ]";
diff --git a/tests/acceptance/10_files/11_xml_edits/build_xpath_002.cf b/tests/acceptance/10_files/11_xml_edits/build_xpath_002.cf
index c3a935e7bb..c16317aaa1 100644
--- a/tests/acceptance/10_files/11_xml_edits/build_xpath_002.cf
+++ b/tests/acceptance/10_files/11_xml_edits/build_xpath_002.cf
@@ -47,6 +47,10 @@ body edit_defaults init_empty
 #######################################################
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "xpath" string =>
       "/Server/Service/Engine/Host[ Alias = cfe_alias | @name=\"cfe_host\" ]";
diff --git a/tests/acceptance/10_files/11_xml_edits/build_xpath_003.cf b/tests/acceptance/10_files/11_xml_edits/build_xpath_003.cf
index d4388c2085..9f4e653f15 100644
--- a/tests/acceptance/10_files/11_xml_edits/build_xpath_003.cf
+++ b/tests/acceptance/10_files/11_xml_edits/build_xpath_003.cf
@@ -47,6 +47,10 @@ body edit_defaults init_empty
 #######################################################
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "xpath" string =>
       "/Server/Service/Engine/OneFish/TwoFish/RedFish/BlueFish/Host[ Alias = cfe_alias | @name=\"cfe_host\" ]";
diff --git a/tests/acceptance/10_files/11_xml_edits/delete_attribute_001.cf b/tests/acceptance/10_files/11_xml_edits/delete_attribute_001.cf
index 263420a8ce..ee4d2742e3 100644
--- a/tests/acceptance/10_files/11_xml_edits/delete_attribute_001.cf
+++ b/tests/acceptance/10_files/11_xml_edits/delete_attribute_001.cf
@@ -61,6 +61,10 @@ body edit_defaults init_empty
 #######################################################
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "attribute_name" string => "topping";
 
diff --git a/tests/acceptance/10_files/11_xml_edits/delete_attribute_002.cf b/tests/acceptance/10_files/11_xml_edits/delete_attribute_002.cf
index 11d0db2b92..e40fec30ff 100644
--- a/tests/acceptance/10_files/11_xml_edits/delete_attribute_002.cf
+++ b/tests/acceptance/10_files/11_xml_edits/delete_attribute_002.cf
@@ -47,6 +47,10 @@ body edit_defaults init_empty
 #######################################################
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "attribute_name" string => "type";
 
diff --git a/tests/acceptance/10_files/11_xml_edits/delete_text_001.cf b/tests/acceptance/10_files/11_xml_edits/delete_text_001.cf
index 566a8bbf58..3c57480ff4 100644
--- a/tests/acceptance/10_files/11_xml_edits/delete_text_001.cf
+++ b/tests/acceptance/10_files/11_xml_edits/delete_text_001.cf
@@ -59,6 +59,10 @@ body edit_defaults init_empty
 #######################################################
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "text" string => "Hot Potatoes!!!";
 
diff --git a/tests/acceptance/10_files/11_xml_edits/delete_text_002.cf b/tests/acceptance/10_files/11_xml_edits/delete_text_002.cf
index c24b79fcfd..e6bb71b1d8 100644
--- a/tests/acceptance/10_files/11_xml_edits/delete_text_002.cf
+++ b/tests/acceptance/10_files/11_xml_edits/delete_text_002.cf
@@ -47,6 +47,10 @@ body edit_defaults init_empty
 #######################################################
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "text" string => "Nemo";
 
diff --git a/tests/acceptance/10_files/11_xml_edits/delete_tree_001.cf b/tests/acceptance/10_files/11_xml_edits/delete_tree_001.cf
index daef9a93b4..7d219b608f 100644
--- a/tests/acceptance/10_files/11_xml_edits/delete_tree_001.cf
+++ b/tests/acceptance/10_files/11_xml_edits/delete_tree_001.cf
@@ -78,6 +78,10 @@ body edit_defaults init_empty
 #######################################################
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "tree" string =>
       "<BabyPotato name=\"Four\">
diff --git a/tests/acceptance/10_files/11_xml_edits/delete_tree_002.cf b/tests/acceptance/10_files/11_xml_edits/delete_tree_002.cf
index df413c0711..e677aba6c7 100644
--- a/tests/acceptance/10_files/11_xml_edits/delete_tree_002.cf
+++ b/tests/acceptance/10_files/11_xml_edits/delete_tree_002.cf
@@ -52,6 +52,10 @@ body edit_defaults init_empty
 #######################################################
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "tree" string =>
       "<Host name=\"cfe_host\" debug=\"0\" appBase=\"webapps/cfe_host\"
diff --git a/tests/acceptance/10_files/11_xml_edits/insert_host_example.cf b/tests/acceptance/10_files/11_xml_edits/insert_host_example.cf
index a1c4979c0c..c22fcbfd82 100644
--- a/tests/acceptance/10_files/11_xml_edits/insert_host_example.cf
+++ b/tests/acceptance/10_files/11_xml_edits/insert_host_example.cf
@@ -110,6 +110,10 @@ body edit_defaults init_empty
 #######################################################
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "host" string =>
       "<Host name=\"cfe_host\" debug=\"0\" appBase=\"webapps/cfe_host\"
diff --git a/tests/acceptance/10_files/11_xml_edits/insert_text_001.cf b/tests/acceptance/10_files/11_xml_edits/insert_text_001.cf
index 3db2ed9aba..f7b276f3bc 100644
--- a/tests/acceptance/10_files/11_xml_edits/insert_text_001.cf
+++ b/tests/acceptance/10_files/11_xml_edits/insert_text_001.cf
@@ -61,6 +61,10 @@ body edit_defaults init_empty
 #######################################################
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "text" string => "Hot Potatoes!!!";
 
diff --git a/tests/acceptance/10_files/11_xml_edits/insert_text_002.cf b/tests/acceptance/10_files/11_xml_edits/insert_text_002.cf
index 5cd86d4c77..655bab0658 100644
--- a/tests/acceptance/10_files/11_xml_edits/insert_text_002.cf
+++ b/tests/acceptance/10_files/11_xml_edits/insert_text_002.cf
@@ -47,6 +47,10 @@ body edit_defaults init_empty
 #######################################################
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "text" string => "Nemo";
 
diff --git a/tests/acceptance/10_files/11_xml_edits/insert_tree_001.cf b/tests/acceptance/10_files/11_xml_edits/insert_tree_001.cf
index 2fca31c18c..8c71f3b706 100644
--- a/tests/acceptance/10_files/11_xml_edits/insert_tree_001.cf
+++ b/tests/acceptance/10_files/11_xml_edits/insert_tree_001.cf
@@ -78,6 +78,10 @@ body edit_defaults init_empty
 #######################################################
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "tree" string =>
       "<BabyPotato name=\"Four\">
diff --git a/tests/acceptance/10_files/11_xml_edits/insert_tree_003.cf b/tests/acceptance/10_files/11_xml_edits/insert_tree_003.cf
index 9ea96177af..f80f8cb340 100644
--- a/tests/acceptance/10_files/11_xml_edits/insert_tree_003.cf
+++ b/tests/acceptance/10_files/11_xml_edits/insert_tree_003.cf
@@ -52,6 +52,10 @@ body edit_defaults init_empty
 #######################################################
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "content" string =>
       "<Host name=\"cfe_host\" debug=\"0\" appBase=\"webapps/cfe_host\"
diff --git a/tests/acceptance/10_files/11_xml_edits/set_attribute_001.cf b/tests/acceptance/10_files/11_xml_edits/set_attribute_001.cf
index 669a5271c0..6706169d8a 100644
--- a/tests/acceptance/10_files/11_xml_edits/set_attribute_001.cf
+++ b/tests/acceptance/10_files/11_xml_edits/set_attribute_001.cf
@@ -61,6 +61,10 @@ body edit_defaults init_empty
 #######################################################
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "attribute_name" string => "topping";
 
diff --git a/tests/acceptance/10_files/11_xml_edits/set_attribute_002.cf b/tests/acceptance/10_files/11_xml_edits/set_attribute_002.cf
index ca92b33833..2c0347fcec 100644
--- a/tests/acceptance/10_files/11_xml_edits/set_attribute_002.cf
+++ b/tests/acceptance/10_files/11_xml_edits/set_attribute_002.cf
@@ -47,6 +47,10 @@ body edit_defaults init_empty
 #######################################################
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "attribute_name" string => "type";
 
diff --git a/tests/acceptance/10_files/11_xml_edits/set_attribute_003.cf b/tests/acceptance/10_files/11_xml_edits/set_attribute_003.cf
index c25ba69d10..14b342a244 100644
--- a/tests/acceptance/10_files/11_xml_edits/set_attribute_003.cf
+++ b/tests/acceptance/10_files/11_xml_edits/set_attribute_003.cf
@@ -61,6 +61,10 @@ body edit_defaults init_empty
 #######################################################
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "attribute_name" string => "topping";
 
diff --git a/tests/acceptance/10_files/11_xml_edits/set_text_001.cf b/tests/acceptance/10_files/11_xml_edits/set_text_001.cf
index 139e748c69..6f9ac85802 100644
--- a/tests/acceptance/10_files/11_xml_edits/set_text_001.cf
+++ b/tests/acceptance/10_files/11_xml_edits/set_text_001.cf
@@ -60,6 +60,10 @@ body edit_defaults init_empty
 #######################################################
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "text" string => "Hot Potatoes!!!";
 
diff --git a/tests/acceptance/10_files/11_xml_edits/set_text_002.cf b/tests/acceptance/10_files/11_xml_edits/set_text_002.cf
index f75c6d2954..291ecb9c1f 100644
--- a/tests/acceptance/10_files/11_xml_edits/set_text_002.cf
+++ b/tests/acceptance/10_files/11_xml_edits/set_text_002.cf
@@ -47,6 +47,10 @@ body edit_defaults init_empty
 #######################################################
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   vars:
       "text" string => "Nemo";
 
diff --git a/tests/acceptance/10_files/FIM/monitoring_symlinks_does_not_constantly_report_change.cf b/tests/acceptance/10_files/FIM/monitoring_symlinks_does_not_constantly_report_change.cf
index dde6fe9a95..fe1b5d5cd0 100644
--- a/tests/acceptance/10_files/FIM/monitoring_symlinks_does_not_constantly_report_change.cf
+++ b/tests/acceptance/10_files/FIM/monitoring_symlinks_does_not_constantly_report_change.cf
@@ -25,7 +25,7 @@ bundle agent test
                   test there";
  
     "test_soft_fail"
-      string => "any",
+      string => "!windows",
       meta => { "redmine7692" };
 }
 
diff --git a/tests/acceptance/10_files/copy_from_preserve_false.cf b/tests/acceptance/10_files/copy_from_preserve_false.cf
index 5b30fbbe71..70a7375919 100644
--- a/tests/acceptance/10_files/copy_from_preserve_false.cf
+++ b/tests/acceptance/10_files/copy_from_preserve_false.cf
@@ -38,6 +38,9 @@ bundle agent test
         string => "Test that preserve false in body copy_from doesn't modify
         permissions of the promised file";
 
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
+
   files:
 
       # We promise that the target is a copy of the source file Since preserve
diff --git a/tests/acceptance/10_files/files_with_spaces.cf b/tests/acceptance/10_files/files_with_spaces.cf
index 93db9c2592..01124151da 100644
--- a/tests/acceptance/10_files/files_with_spaces.cf
+++ b/tests/acceptance/10_files/files_with_spaces.cf
@@ -21,10 +21,6 @@ bundle agent test
     "description"
       string => "Test that file paths with spaces can be created without special treatment";
 
-    "test_soft_fail"
-      string => "windows",
-      meta => { "redmine7934" };
-
   vars:
     "file[1]" string => "file with space.txt";
     "file[2]" string => "path with/a space.txt";
diff --git a/tests/acceptance/10_files/mustache_missing_variable_is_empty_string_by_default.cf b/tests/acceptance/10_files/mustache_missing_variable_is_empty_string_by_default.cf
index 37e7e2e183..028bc10f08 100644
--- a/tests/acceptance/10_files/mustache_missing_variable_is_empty_string_by_default.cf
+++ b/tests/acceptance/10_files/mustache_missing_variable_is_empty_string_by_default.cf
@@ -32,6 +32,10 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10254" };
+
   files:
     "$(init.template_target)"
       edit_template => "$(this.promise_filename).mustache",
diff --git a/tests/acceptance/10_files/mustache_render_multiline_template_data.cf b/tests/acceptance/10_files/mustache_render_multiline_template_data.cf
index eff73e17c2..12b98f1870 100644
--- a/tests/acceptance/10_files/mustache_render_multiline_template_data.cf
+++ b/tests/acceptance/10_files/mustache_render_multiline_template_data.cf
@@ -13,6 +13,10 @@ body common control
 
 bundle agent test 
 {
+  meta:
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10254" };
+
   vars:
     "template_target" string => "$(G.testfile)";
 
diff --git a/tests/acceptance/10_files/templating/edit_template_string/mustache_edit_template_string_vs_string_mustache.cf b/tests/acceptance/10_files/templating/edit_template_string/mustache_edit_template_string_vs_string_mustache.cf
index 3b5ddaa88c..510a706865 100644
--- a/tests/acceptance/10_files/templating/edit_template_string/mustache_edit_template_string_vs_string_mustache.cf
+++ b/tests/acceptance/10_files/templating/edit_template_string/mustache_edit_template_string_vs_string_mustache.cf
@@ -22,6 +22,9 @@ bundle agent test
         string => "Test that there is no difference when rendering the same
         mustache template with edit_template and edit_template_string";
 
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
 
       "pghbadirectives" data => '[
diff --git a/tests/acceptance/10_files/templating/mustache_expect_list_find_string.cf b/tests/acceptance/10_files/templating/mustache_expect_list_find_string.cf
index fc7a8701f7..69e115abb8 100644
--- a/tests/acceptance/10_files/templating/mustache_expect_list_find_string.cf
+++ b/tests/acceptance/10_files/templating/mustache_expect_list_find_string.cf
@@ -48,6 +48,10 @@ bundle agent init_filestat(n, f)
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10257" };
+
   methods:
       "mustache good" usebundle => file_mustache_jsonstring($(template),
                                                                 '{"mykeys": ["template expects list of strings"]}',
diff --git a/tests/acceptance/10_files/templating/mustache_top_level_iteration.cf b/tests/acceptance/10_files/templating/mustache_top_level_iteration.cf
index 414ccdec1e..5830168242 100644
--- a/tests/acceptance/10_files/templating/mustache_top_level_iteration.cf
+++ b/tests/acceptance/10_files/templating/mustache_top_level_iteration.cf
@@ -16,6 +16,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   vars:
       "mydata1" data => '{ "a": 100 }';
       "mydata2" data => '[ "p", "q" ]';
diff --git a/tests/acceptance/10_files/this_promiser.cf b/tests/acceptance/10_files/this_promiser.cf
index 5b3e62253a..c56ebc84ae 100644
--- a/tests/acceptance/10_files/this_promiser.cf
+++ b/tests/acceptance/10_files/this_promiser.cf
@@ -55,6 +55,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10257" };
   commands:
     "$(G.true)"
       classes => promiser0_generic;
@@ -154,7 +157,7 @@ body file_select by_exec_cmd
 # Redmine #3530
 {
       leaf_name => {"ba"};
-      exec_program => "/bin/ls $(this.promiser)";
+      exec_program => "$(G.ls) $(this.promiser)";
       file_result => "leaf_name.exec_program";
 }
 
diff --git a/tests/acceptance/14_reports/00_output/unresolved_vars.cf b/tests/acceptance/14_reports/00_output/unresolved_vars.cf
index 6cd0ede62b..475b773ac4 100644
--- a/tests/acceptance/14_reports/00_output/unresolved_vars.cf
+++ b/tests/acceptance/14_reports/00_output/unresolved_vars.cf
@@ -34,6 +34,9 @@ bundle agent test
       "description" -> { "CFE-3776" }
         string => "Test that reports with unresolved variables are only emitted during the last pass of evaluation";
 
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   commands:
       "$(sys.cf_agent) -Kf $(this.promise_filename).sub > $(G.testfile).actual"
         contain => shell;
diff --git a/tests/acceptance/14_reports/00_output/unresolved_with.cf b/tests/acceptance/14_reports/00_output/unresolved_with.cf
index 6965f5e9df..ba6ff0480b 100644
--- a/tests/acceptance/14_reports/00_output/unresolved_with.cf
+++ b/tests/acceptance/14_reports/00_output/unresolved_with.cf
@@ -26,6 +26,9 @@ bundle agent test
       "description" -> { "CFE-3776" }
         string => "Test that with reports its content during the last pass even when that content has unresolved variables ";
 
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
+
   commands:
       "$(sys.cf_agent) -Kf $(this.promise_filename).sub > $(G.testfile).actual"
         contain => shell;
diff --git a/tests/acceptance/16_cf-serverd/serial/007.cf b/tests/acceptance/16_cf-serverd/serial/007.cf
index b9d298dc7f..1e8a9090d2 100644
--- a/tests/acceptance/16_cf-serverd/serial/007.cf
+++ b/tests/acceptance/16_cf-serverd/serial/007.cf
@@ -8,6 +8,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10401" };
+
   methods:
       # source file
       "any" usebundle => file_make("$(G.testdir)/source_file",
diff --git a/tests/acceptance/16_cf-serverd/serial/008.cf b/tests/acceptance/16_cf-serverd/serial/008.cf
index b9d298dc7f..1e8a9090d2 100644
--- a/tests/acceptance/16_cf-serverd/serial/008.cf
+++ b/tests/acceptance/16_cf-serverd/serial/008.cf
@@ -8,6 +8,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10401" };
+
   methods:
       # source file
       "any" usebundle => file_make("$(G.testdir)/source_file",
diff --git a/tests/acceptance/16_cf-serverd/serial/010.cf b/tests/acceptance/16_cf-serverd/serial/010.cf
index b9d298dc7f..1e8a9090d2 100644
--- a/tests/acceptance/16_cf-serverd/serial/010.cf
+++ b/tests/acceptance/16_cf-serverd/serial/010.cf
@@ -8,6 +8,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10401" };
+
   methods:
       # source file
       "any" usebundle => file_make("$(G.testdir)/source_file",
diff --git a/tests/acceptance/16_cf-serverd/serial/011.cf b/tests/acceptance/16_cf-serverd/serial/011.cf
index b9d298dc7f..1e8a9090d2 100644
--- a/tests/acceptance/16_cf-serverd/serial/011.cf
+++ b/tests/acceptance/16_cf-serverd/serial/011.cf
@@ -8,6 +8,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10401" };
+
   methods:
       # source file
       "any" usebundle => file_make("$(G.testdir)/source_file",
diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_success.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_success.cf
index 21678b3bde..9585f5cbd1 100644
--- a/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_success.cf
+++ b/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_success.cf
@@ -7,6 +7,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10401" };
+
   methods:
       # source file
       "any" usebundle => file_make("$(G.testdir)/source_file",
diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different.cf
index 7ae9a7c2ee..9882be5491 100644
--- a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different.cf
+++ b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different.cf
@@ -8,6 +8,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10401" };
+
   methods:
       "any" usebundle => file_make("$(G.testdir)/source_file",
                                    "Source and Destination are DIFFERENT_A");
diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip.cf
index 1c5c42b703..f327f6ca7f 100644
--- a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip.cf
+++ b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip.cf
@@ -8,6 +8,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10401" };
+
   methods:
       "any" usebundle => file_make("$(G.testdir)/127.0.0.1.txt",
                                    "Source and Destination are different_A");
diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip_and_shortcut.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip_and_shortcut.cf
index 731721978b..f327f6ca7f 100644
--- a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip_and_shortcut.cf
+++ b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_ip_and_shortcut.cf
@@ -8,6 +8,9 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10401" };
 
   methods:
       "any" usebundle => file_make("$(G.testdir)/127.0.0.1.txt",
diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_shortcut.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_shortcut.cf
index 1c504c8422..139a1e35ba 100644
--- a/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_shortcut.cf
+++ b/tests/acceptance/16_cf-serverd/serial/copy_from_digest_different_expand_shortcut.cf
@@ -7,6 +7,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10401" };
+
   methods:
       # source file
       "any" usebundle => file_make("$(G.testdir)/source_file",
diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_encrypted_md5_zero_length_file.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_encrypted_md5_zero_length_file.cf
index 5e2d54e74b..b99eaa6243 100644
--- a/tests/acceptance/16_cf-serverd/serial/copy_from_encrypted_md5_zero_length_file.cf
+++ b/tests/acceptance/16_cf-serverd/serial/copy_from_encrypted_md5_zero_length_file.cf
@@ -8,6 +8,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10401" };
+
   methods:
       # source file
       "any" usebundle => file_empty("$(G.testdir)/source_file");
diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_expand_ip_directory.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_expand_ip_directory.cf
index f43712bf14..c79ff63c7e 100644
--- a/tests/acceptance/16_cf-serverd/serial/copy_from_expand_ip_directory.cf
+++ b/tests/acceptance/16_cf-serverd/serial/copy_from_expand_ip_directory.cf
@@ -15,6 +15,10 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10401" };
+
   methods:
       "any" usebundle => file_make("$(G.testdir)/127.0.0.1_DIR1/ADMIT_FILE",
                                    "ADMIT_FILE A CONTENTS");
diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed-classic_protocol.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed-classic_protocol.cf
index a600670708..f3e45f0131 100644
--- a/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed-classic_protocol.cf
+++ b/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed-classic_protocol.cf
@@ -8,6 +8,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10401" };
+
   methods:
       # source file
       "any" usebundle => file_make("$(G.testdir)/source_file",
diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed.cf
index a600670708..f3e45f0131 100644
--- a/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed.cf
+++ b/tests/acceptance/16_cf-serverd/serial/copy_from_inexistent_file_connection_closed.cf
@@ -8,6 +8,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10401" };
+
   methods:
       # source file
       "any" usebundle => file_make("$(G.testdir)/source_file",
diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_md5_zero_length_file.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_md5_zero_length_file.cf
index 5e2d54e74b..b99eaa6243 100644
--- a/tests/acceptance/16_cf-serverd/serial/copy_from_md5_zero_length_file.cf
+++ b/tests/acceptance/16_cf-serverd/serial/copy_from_md5_zero_length_file.cf
@@ -8,6 +8,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10401" };
+
   methods:
       # source file
       "any" usebundle => file_empty("$(G.testdir)/source_file");
diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_fail.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_fail.cf
index 33473895eb..f580826488 100644
--- a/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_fail.cf
+++ b/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_fail.cf
@@ -13,6 +13,9 @@ bundle agent test
       "description" -> {"ENT-4617"}
         string => "Test that requiring TLS 1.3 works fine";
 
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10401" };
+
   methods:
       # source file
       "any" usebundle => file_make("$(G.testdir)/source_file",
diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_success.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_success.cf
index aa41db3bae..867d21ad96 100644
--- a/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_success.cf
+++ b/tests/acceptance/16_cf-serverd/serial/copy_from_tls_1_3_success.cf
@@ -13,6 +13,8 @@ bundle agent test
       "description" -> {"ENT-4617"}
         string => "Test that CFEngine connections over TLS 1.3 work fine";
 
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10401" };
   methods:
       # source file
       "any" usebundle => file_make("$(G.testdir)/source_file",
diff --git a/tests/acceptance/16_cf-serverd/serial/copy_missing_ok.cf b/tests/acceptance/16_cf-serverd/serial/copy_missing_ok.cf
index 4cd3aac5c6..9ae428b473 100644
--- a/tests/acceptance/16_cf-serverd/serial/copy_missing_ok.cf
+++ b/tests/acceptance/16_cf-serverd/serial/copy_missing_ok.cf
@@ -7,6 +7,10 @@ body common control
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10401" };
+
   methods:
       # ensure destination files are not there
       "any" usebundle => dcs_fini("$(G.testdir)/dir");
diff --git a/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed_regex_disallowed_admitted.cf b/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed_regex_disallowed_admitted.cf
index 8bc0b49463..84a92cb499 100644
--- a/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed_regex_disallowed_admitted.cf
+++ b/tests/acceptance/22_cf-runagent/serial/bundles_all_allowed_regex_disallowed_admitted.cf
@@ -24,6 +24,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10404" };
   vars:
       "runagent_cf" string =>
         "$(this.promise_dirname)/empty_config.runagent.cf.sub";
diff --git a/tests/acceptance/22_cf-runagent/serial/cfruncommand_argv0_quoted.cf b/tests/acceptance/22_cf-runagent/serial/cfruncommand_argv0_quoted.cf
index 4ffbb09f35..83901b0d19 100644
--- a/tests/acceptance/22_cf-runagent/serial/cfruncommand_argv0_quoted.cf
+++ b/tests/acceptance/22_cf-runagent/serial/cfruncommand_argv0_quoted.cf
@@ -24,6 +24,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10404" };
   vars:
       "runagent_cf" string =>
         "$(this.promise_dirname)/empty_config.runagent.cf.sub";
diff --git a/tests/acceptance/22_cf-runagent/serial/cfruncommand_open.cf b/tests/acceptance/22_cf-runagent/serial/cfruncommand_open.cf
index 1abdc628e6..ea6acae5c3 100644
--- a/tests/acceptance/22_cf-runagent/serial/cfruncommand_open.cf
+++ b/tests/acceptance/22_cf-runagent/serial/cfruncommand_open.cf
@@ -24,6 +24,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10404" };
   vars:
       "runagent_cf" string =>
         "$(this.promise_dirname)/empty_config.runagent.cf.sub";
diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_admitted_1.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_admitted_1.cf
index 6fe4422f51..66cc006c40 100644
--- a/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_admitted_1.cf
+++ b/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_admitted_1.cf
@@ -24,6 +24,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10404" };
   vars:
       "runagent_cf" string =>
         "$(this.promise_dirname)/empty_config.runagent.cf.sub";
diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_bundle2_admitted_1.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_bundle2_admitted_1.cf
index c4f18222bb..d9f0ab8898 100644
--- a/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_bundle2_admitted_1.cf
+++ b/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle1_bundle2_admitted_1.cf
@@ -24,6 +24,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10404" };
   vars:
       "runagent_cf" string =>
         "$(this.promise_dirname)/empty_config.runagent.cf.sub";
diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle2_admitted.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle2_admitted.cf
index eaa2daae37..421913028a 100644
--- a/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle2_admitted.cf
+++ b/tests/acceptance/22_cf-runagent/serial/runagent_-B_bundle2_admitted.cf
@@ -24,6 +24,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10404" };
   vars:
       "runagent_cf" string =>
         "$(this.promise_dirname)/empty_config.runagent.cf.sub";
diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_ns1_role2_-B_ns2_bundle2_admitted.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_ns1_role2_-B_ns2_bundle2_admitted.cf
index 1c038f3575..9c2b39bf4d 100644
--- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_ns1_role2_-B_ns2_bundle2_admitted.cf
+++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_ns1_role2_-B_ns2_bundle2_admitted.cf
@@ -24,6 +24,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10404" };
   vars:
       "runagent_cf" string =>
         "$(this.promise_dirname)/empty_config.runagent.cf.sub";
diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1-B_bundle1_admitted_1.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1-B_bundle1_admitted_1.cf
index 18de7a3704..cbaa462bcd 100644
--- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1-B_bundle1_admitted_1.cf
+++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1-B_bundle1_admitted_1.cf
@@ -24,6 +24,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10404" };
   vars:
       "runagent_cf" string =>
         "$(this.promise_dirname)/empty_config.runagent.cf.sub";
diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_-D_role2_admitted.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_-D_role2_admitted.cf
index c20bc3453d..2182a5ca01 100644
--- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_-D_role2_admitted.cf
+++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_-D_role2_admitted.cf
@@ -24,6 +24,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10404" };
   vars:
       "runagent_cf" string =>
         "$(this.promise_dirname)/empty_config.runagent.cf.sub";
diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_1.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_1.cf
index 8ba30680a1..4f4fd72db2 100644
--- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_1.cf
+++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_1.cf
@@ -24,6 +24,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10404" };
   vars:
       "runagent_cf" string =>
         "$(this.promise_dirname)/empty_config.runagent.cf.sub";
diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_2.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_2.cf
index c01aeeecb5..0b0cb1f4f2 100644
--- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_2.cf
+++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_2.cf
@@ -24,6 +24,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10404" };
   vars:
       "runagent_cf" string =>
         "$(this.promise_dirname)/empty_config.runagent.cf.sub";
diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_3.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_3.cf
index 202358fd10..070d03b888 100644
--- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_3.cf
+++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_admitted_3.cf
@@ -24,6 +24,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10404" };
   vars:
       "runagent_cf" string =>
         "$(this.promise_dirname)/empty_config.runagent.cf.sub";
diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_admitted_1.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_admitted_1.cf
index 3cf9662b30..bd587cb715 100644
--- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_admitted_1.cf
+++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_admitted_1.cf
@@ -24,6 +24,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10404" };
   vars:
       "runagent_cf" string =>
         "$(this.promise_dirname)/empty_config.runagent.cf.sub";
diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_admitted_2.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_admitted_2.cf
index d64ea86453..3314a10f09 100644
--- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_admitted_2.cf
+++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role1_role2_admitted_2.cf
@@ -24,6 +24,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10404" };
   vars:
       "runagent_cf" string =>
         "$(this.promise_dirname)/empty_config.runagent.cf.sub";
diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_-B_bundle2_admitted.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_-B_bundle2_admitted.cf
index 3e372725c4..0cc93ef624 100644
--- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_-B_bundle2_admitted.cf
+++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_-B_bundle2_admitted.cf
@@ -24,6 +24,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10404" };
   vars:
       "runagent_cf" string =>
         "$(this.promise_dirname)/empty_config.runagent.cf.sub";
diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_admitted_1.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_admitted_1.cf
index 2d7ee1f0fc..e8ec9e91cf 100644
--- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_admitted_1.cf
+++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_admitted_1.cf
@@ -24,6 +24,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10404" };
   vars:
       "runagent_cf" string =>
         "$(this.promise_dirname)/empty_config.runagent.cf.sub";
diff --git a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_admitted_2.cf b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_admitted_2.cf
index 37f964e00c..6b9724740a 100644
--- a/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_admitted_2.cf
+++ b/tests/acceptance/22_cf-runagent/serial/runagent_-D_role2_admitted_2.cf
@@ -24,6 +24,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10404" };
   vars:
       "runagent_cf" string =>
         "$(this.promise_dirname)/empty_config.runagent.cf.sub";
diff --git a/tests/acceptance/24_cmd_line_arguments/parsed_policy.cf b/tests/acceptance/24_cmd_line_arguments/parsed_policy.cf
index d74f7d8a80..d073ded8f5 100644
--- a/tests/acceptance/24_cmd_line_arguments/parsed_policy.cf
+++ b/tests/acceptance/24_cmd_line_arguments/parsed_policy.cf
@@ -21,6 +21,9 @@ bundle agent init
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10254" };
   vars:
       "arg_list" slist => { "none", "cf", "json", "cf-full", "json-full" };
 
diff --git a/tests/acceptance/25_cf-execd/mail_1st_run_empty_new_log.cf b/tests/acceptance/25_cf-execd/mail_1st_run_empty_new_log.cf
index 423ef8170e..accdd80788 100644
--- a/tests/acceptance/25_cf-execd/mail_1st_run_empty_new_log.cf
+++ b/tests/acceptance/25_cf-execd/mail_1st_run_empty_new_log.cf
@@ -28,6 +28,13 @@ bundle agent init
                                                  @(excludes));
 }
 
+bundle agent test
+{
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+}
+
 bundle agent check
 {
   methods:
diff --git a/tests/acceptance/25_cf-execd/mail_empty_old_and_new_log.cf b/tests/acceptance/25_cf-execd/mail_empty_old_and_new_log.cf
index 9c48deb1ad..627a891db7 100644
--- a/tests/acceptance/25_cf-execd/mail_empty_old_and_new_log.cf
+++ b/tests/acceptance/25_cf-execd/mail_empty_old_and_new_log.cf
@@ -33,6 +33,13 @@ bundle agent init
         link_from => linkfrom("$(sys.workdir)/outputs/old.log", "symlink");
 }
 
+bundle agent test
+{
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+}
+
 bundle agent check
 {
   methods:
diff --git a/tests/acceptance/25_cf-execd/mail_exclude_filter.cf b/tests/acceptance/25_cf-execd/mail_exclude_filter.cf
index 41f35b3dee..62e868752d 100644
--- a/tests/acceptance/25_cf-execd/mail_exclude_filter.cf
+++ b/tests/acceptance/25_cf-execd/mail_exclude_filter.cf
@@ -25,6 +25,13 @@ bundle agent init
                                                  @(excludes));
 }
 
+bundle agent test
+{
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+}
+
 bundle agent check
 {
   vars:
diff --git a/tests/acceptance/25_cf-execd/mail_include_and_exclude_filters.cf b/tests/acceptance/25_cf-execd/mail_include_and_exclude_filters.cf
index 6023b6a474..26ecb478d3 100644
--- a/tests/acceptance/25_cf-execd/mail_include_and_exclude_filters.cf
+++ b/tests/acceptance/25_cf-execd/mail_include_and_exclude_filters.cf
@@ -34,6 +34,13 @@ bundle agent init
                                                  @(excludes));
 }
 
+bundle agent test
+{
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+}
+
 bundle agent check
 {
   vars:
diff --git a/tests/acceptance/25_cf-execd/mail_include_filter.cf b/tests/acceptance/25_cf-execd/mail_include_filter.cf
index b97e96c452..b5532d33da 100644
--- a/tests/acceptance/25_cf-execd/mail_include_filter.cf
+++ b/tests/acceptance/25_cf-execd/mail_include_filter.cf
@@ -25,6 +25,13 @@ bundle agent init
                                                  @(excludes));
 }
 
+bundle agent test
+{
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+}
+
 bundle agent check
 {
   vars:
diff --git a/tests/acceptance/25_cf-execd/mail_no_filter.cf b/tests/acceptance/25_cf-execd/mail_no_filter.cf
index 633e64f22d..c26b9bd775 100644
--- a/tests/acceptance/25_cf-execd/mail_no_filter.cf
+++ b/tests/acceptance/25_cf-execd/mail_no_filter.cf
@@ -22,6 +22,13 @@ bundle agent init
                                                  @(excludes));
 }
 
+bundle agent test
+{
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+}
+
 bundle agent check
 {
   vars:
diff --git a/tests/acceptance/25_cf-execd/mailfilter_1st_run_everything_filtered.cf b/tests/acceptance/25_cf-execd/mailfilter_1st_run_everything_filtered.cf
index 346f8927fb..4dec4da34e 100644
--- a/tests/acceptance/25_cf-execd/mailfilter_1st_run_everything_filtered.cf
+++ b/tests/acceptance/25_cf-execd/mailfilter_1st_run_everything_filtered.cf
@@ -32,6 +32,13 @@ bundle agent init
                                                  @(excludes));
 }
 
+bundle agent test
+{
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+}
+
 bundle agent check
 {
   methods:
diff --git a/tests/acceptance/25_cf-execd/mailfilter_empty_old_log_everything_filtered.cf b/tests/acceptance/25_cf-execd/mailfilter_empty_old_log_everything_filtered.cf
index 8b19d6207f..bd01a2f260 100644
--- a/tests/acceptance/25_cf-execd/mailfilter_empty_old_log_everything_filtered.cf
+++ b/tests/acceptance/25_cf-execd/mailfilter_empty_old_log_everything_filtered.cf
@@ -38,6 +38,13 @@ bundle agent init
         link_from => linkfrom("$(sys.workdir)/outputs/old.log", "symlink");
 }
 
+bundle agent test
+{
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+}
+
 bundle agent check
 {
   methods:
diff --git a/tests/acceptance/25_cf-execd/slow/dies_in_time.cf b/tests/acceptance/25_cf-execd/slow/dies_in_time.cf
index 758ca963f5..e95942b2f6 100644
--- a/tests/acceptance/25_cf-execd/slow/dies_in_time.cf
+++ b/tests/acceptance/25_cf-execd/slow/dies_in_time.cf
@@ -74,6 +74,10 @@ echo DONE > $(G.testdir)/exec_command.status
 
 bundle agent test
 {
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+
   commands:
 
       "$(sys.cf_execd) -f $(this.promise_dirname)/kill_myself.execd.srv"
diff --git a/tests/acceptance/25_cf-execd/timed/mailfilter_repeated_runs.cf b/tests/acceptance/25_cf-execd/timed/mailfilter_repeated_runs.cf
index 29b611e793..1bcd8181b2 100644
--- a/tests/acceptance/25_cf-execd/timed/mailfilter_repeated_runs.cf
+++ b/tests/acceptance/25_cf-execd/timed/mailfilter_repeated_runs.cf
@@ -107,6 +107,13 @@ bundle agent init
       "any" usebundle => run_cf_execd(@(expected5), @(unexpected));
 }
 
+bundle agent test
+{
+  meta:
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10215" };
+}
+
 bundle agent check
 {
   methods:
diff --git a/tests/acceptance/26_cf-net/serial/cf-net_connect.cf b/tests/acceptance/26_cf-net/serial/cf-net_connect.cf
index f5b0521ce5..033183ac17 100644
--- a/tests/acceptance/26_cf-net/serial/cf-net_connect.cf
+++ b/tests/acceptance/26_cf-net/serial/cf-net_connect.cf
@@ -34,6 +34,8 @@ bundle agent test
             contain => myshell;
     meta:
         "description" string => "Connect and authenticate with cf-serverd";
+        "test_soft_fail" string => "windows",
+          meta => { "ENT-10254" };
 }
 
 bundle agent check
diff --git a/tests/acceptance/26_cf-net/serial/cf-net_get.cf b/tests/acceptance/26_cf-net/serial/cf-net_get.cf
index 12511dde21..3d0d78ee18 100644
--- a/tests/acceptance/26_cf-net/serial/cf-net_get.cf
+++ b/tests/acceptance/26_cf-net/serial/cf-net_get.cf
@@ -34,6 +34,9 @@ bundle agent test
             contain => myshell;
     meta:
         "description" string => "STAT+GET policy file from cf-serverd";
+        "test_skip_needs_work" string => "windows",
+          comment => "for some reason, softfailing this test is not enough",
+          meta => { "ENT-10254" };
 }
 
 bundle agent check
diff --git a/tests/acceptance/26_cf-net/serial/cf-net_help.cf b/tests/acceptance/26_cf-net/serial/cf-net_help.cf
index db8c487748..ebfbe74a8e 100644
--- a/tests/acceptance/26_cf-net/serial/cf-net_help.cf
+++ b/tests/acceptance/26_cf-net/serial/cf-net_help.cf
@@ -29,6 +29,8 @@ bundle agent test
             contain => myshell;
     meta:
         "description" string => "Argument parsing and help output";
+        "test_soft_fail" string => "windows",
+          meta => { "ENT-10254" };
 }
 
 bundle agent check
diff --git a/tests/acceptance/26_cf-net/serial/cf-net_stat.cf b/tests/acceptance/26_cf-net/serial/cf-net_stat.cf
index 8d9c2f0c30..2fdb01740e 100644
--- a/tests/acceptance/26_cf-net/serial/cf-net_stat.cf
+++ b/tests/acceptance/26_cf-net/serial/cf-net_stat.cf
@@ -38,6 +38,8 @@ bundle agent test
             contain => myshell;
     meta:
         "description" string => "Stat a regular file (this policy file)";
+        "test_soft_fail" string => "windows",
+          meta => { "ENT-10254" };
 }
 
 bundle agent check
diff --git a/tests/acceptance/26_cf-net/serial/cf-net_stat_deny.cf b/tests/acceptance/26_cf-net/serial/cf-net_stat_deny.cf
index 6f4d18d3ec..ecea92f941 100644
--- a/tests/acceptance/26_cf-net/serial/cf-net_stat_deny.cf
+++ b/tests/acceptance/26_cf-net/serial/cf-net_stat_deny.cf
@@ -38,6 +38,8 @@ bundle agent test
             contain => myshell;
     meta:
         "description" string => "Attempt to stat file without permission";
+        "test_soft_fail" string => "windows",
+          meta => { "ENT-10254" };
 }
 
 bundle agent check
diff --git a/tests/acceptance/26_cf-net/serial/cf-net_stat_dir.cf b/tests/acceptance/26_cf-net/serial/cf-net_stat_dir.cf
index 80f1d5563a..685beb317c 100644
--- a/tests/acceptance/26_cf-net/serial/cf-net_stat_dir.cf
+++ b/tests/acceptance/26_cf-net/serial/cf-net_stat_dir.cf
@@ -38,6 +38,8 @@ bundle agent test
             contain => myshell;
     meta:
         "description" string => "Stat a directory";
+        "test_soft_fail" string => "windows",
+          meta => { "ENT-10254" };
 }
 
 bundle agent check
diff --git a/tests/acceptance/27_cf-secret/decrypt.cf b/tests/acceptance/27_cf-secret/decrypt.cf
index 1dbca5ce79..0baf3c522c 100644
--- a/tests/acceptance/27_cf-secret/decrypt.cf
+++ b/tests/acceptance/27_cf-secret/decrypt.cf
@@ -10,6 +10,8 @@ bundle agent test
     meta:
         "description"
             string => "Test that cf-secret can still decrypt content encrypted at the time of initial implementation";
+        "test_soft_fail" string => "windows",
+            meta => { "ENT-10405" };
 
     commands:
         "$(sys.cf_secret)"
diff --git a/tests/acceptance/27_cf-secret/encrypt-decrypt-args.cf b/tests/acceptance/27_cf-secret/encrypt-decrypt-args.cf
index d1979688cf..1a3208686e 100644
--- a/tests/acceptance/27_cf-secret/encrypt-decrypt-args.cf
+++ b/tests/acceptance/27_cf-secret/encrypt-decrypt-args.cf
@@ -21,6 +21,8 @@ bundle agent test
         "description"
         string => "Test cf-secret with different arguments/order";
 
+        "test_soft_fail" string => "windows",
+            meta => { "ENT-10405" };
 
     vars:
         "text" string => "This secret sauce should be encrypted and decrypted.";
diff --git a/tests/acceptance/27_cf-secret/encrypt-decrypt.cf b/tests/acceptance/27_cf-secret/encrypt-decrypt.cf
index 25fb244d8d..57a77623f5 100644
--- a/tests/acceptance/27_cf-secret/encrypt-decrypt.cf
+++ b/tests/acceptance/27_cf-secret/encrypt-decrypt.cf
@@ -21,6 +21,8 @@ bundle agent test
         "description"
             string => "Test that cf-secret basic key based encryption and decryption work";
 
+        "test_soft_fail" string => "windows",
+            meta => { "ENT-10405" };
 
     vars:
         "text"
diff --git a/tests/acceptance/27_cf-secret/encrypt-no-key.cf b/tests/acceptance/27_cf-secret/encrypt-no-key.cf
index ddc1ba9f93..ce84d42363 100644
--- a/tests/acceptance/27_cf-secret/encrypt-no-key.cf
+++ b/tests/acceptance/27_cf-secret/encrypt-no-key.cf
@@ -47,6 +47,9 @@ bundle agent test
       "description" -> { "CFE-3874" }
         string => "Test that encrypting with no host- / key argument defaults to encrypting for localhost.";
 
+      "test_soft_fail" string => "windows",
+        meta => { "ENT-10405" };
+
   commands:
     # Encrypt test file
       "$(sys.cf_secret)"
diff --git a/tests/acceptance/28_inform_testing/common.cf.sub b/tests/acceptance/28_inform_testing/common.cf.sub
index 4a6ed12b57..2d031bf945 100644
--- a/tests/acceptance/28_inform_testing/common.cf.sub
+++ b/tests/acceptance/28_inform_testing/common.cf.sub
@@ -50,6 +50,10 @@ body delete init_delete
 
 bundle agent test
 {
+  meta:
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10406" },
+      if => not( strcmp( "insert_lines_noop.cf", "$(sys.policy_entry_basename)" ) );
   vars:
     "cf_agent" string => ifelse(isvariable("sys.cf_agent"), "$(sys.cf_agent)", "/var/cfengine/bin/cf-agent");
     "filter_list" slist => { " -e '/filestat bailing/d' ",
diff --git a/tests/acceptance/29_simulate_mode/diff_mode.cf b/tests/acceptance/29_simulate_mode/diff_mode.cf
index 494f17be78..1d031b2e80 100644
--- a/tests/acceptance/29_simulate_mode/diff_mode.cf
+++ b/tests/acceptance/29_simulate_mode/diff_mode.cf
@@ -19,9 +19,10 @@ bundle agent init
 bundle agent test
 {
   meta:
-    "test_soft_fail" string => "(solaris|aix|hpux)",
-      meta => { "ENT-6540" };
+    "test_soft_fail" string => "(solaris|aix|hpux|windows)",
+      meta => { "ENT-6540,ENT-10254" };
       # ENT-6540 exotics fail to delete chroot
+      # ENT-10254 tests fail on Windows due to CRLF
 
     "description" -> { "ENT-5302" }
       string => "Test that files promises in --simulate=diff mode produce proper output and only make changes in chroot";
diff --git a/tests/acceptance/29_simulate_mode/manifest_full_mode.cf b/tests/acceptance/29_simulate_mode/manifest_full_mode.cf
index 84991051b1..c4906d5406 100644
--- a/tests/acceptance/29_simulate_mode/manifest_full_mode.cf
+++ b/tests/acceptance/29_simulate_mode/manifest_full_mode.cf
@@ -19,9 +19,10 @@ bundle agent init
 bundle agent test
 {
   meta:
-    "test_soft_fail" string => "(solaris|aix|hpux)",
-      meta => { "ENT-6540" };
+    "test_soft_fail" string => "(solaris|aix|hpux|windows)",
+      meta => { "ENT-6540,ENT-10254" };
       # ENT-6540 exotics fail to delete chroot
+      # ENT-10254 tests fail on Windows due to CRLF
 
     "description" -> { "ENT-5301" }
       string => "Test that files promises in --simulate=manifest-full mode produce proper output and only make changes in chroot";
diff --git a/tests/acceptance/29_simulate_mode/manifest_mode.cf b/tests/acceptance/29_simulate_mode/manifest_mode.cf
index 841e76513c..dda53e7f42 100644
--- a/tests/acceptance/29_simulate_mode/manifest_mode.cf
+++ b/tests/acceptance/29_simulate_mode/manifest_mode.cf
@@ -19,9 +19,10 @@ bundle agent init
 bundle agent test
 {
   meta:
-    "test_soft_fail" string => "(solaris|aix|hpux)",
-      meta => { "ENT-6540" };
+    "test_soft_fail" string => "(solaris|aix|hpux|windows)",
+      meta => { "ENT-6540,ENT-10254" };
       # ENT-6540 exotics fail to delete chroot
+      # ENT-10254 tests fail on Windows due to CRLF
 
     "description" -> { "ENT-5301" }
       string => "Test that files promises in --simulate=manifest mode produce proper output and only make changes in chroot";
diff --git a/tests/acceptance/30_custom_promise_types/01_basic_module.cf b/tests/acceptance/30_custom_promise_types/01_basic_module.cf
index e19c9a535b..812c362b7f 100644
--- a/tests/acceptance/30_custom_promise_types/01_basic_module.cf
+++ b/tests/acceptance/30_custom_promise_types/01_basic_module.cf
@@ -43,6 +43,9 @@ bundle agent test
   meta:
     "description" -> { "CFE-3443" }
       string => "Test that you can add a promise module and evaluate a custom promise";
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10217" };
+
 
   vars:
     "test_string"
diff --git a/tests/acceptance/30_custom_promise_types/02_if.cf b/tests/acceptance/30_custom_promise_types/02_if.cf
index a54b9664a1..6c3ae9c0e9 100644
--- a/tests/acceptance/30_custom_promise_types/02_if.cf
+++ b/tests/acceptance/30_custom_promise_types/02_if.cf
@@ -58,6 +58,8 @@ bundle agent test
   meta:
     "description" -> { "CFE-3391" }
       string => "Test that custom promises work with if attribute";
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10217" };
 
   vars:
     "false_variable"
diff --git a/tests/acceptance/30_custom_promise_types/05_meta_attr.cf b/tests/acceptance/30_custom_promise_types/05_meta_attr.cf
index 4426b031ef..7e38995dce 100644
--- a/tests/acceptance/30_custom_promise_types/05_meta_attr.cf
+++ b/tests/acceptance/30_custom_promise_types/05_meta_attr.cf
@@ -45,6 +45,8 @@ bundle agent test
   meta:
     "description" -> { "CFE-3440" }
       string => "Test that you can use a meta attribute with a custom promise";
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10217" };
 
   vars:
     "test_string"
diff --git a/tests/acceptance/30_custom_promise_types/11_unless.cf b/tests/acceptance/30_custom_promise_types/11_unless.cf
index d845fde90b..8ca6cdf629 100644
--- a/tests/acceptance/30_custom_promise_types/11_unless.cf
+++ b/tests/acceptance/30_custom_promise_types/11_unless.cf
@@ -58,6 +58,8 @@ bundle agent test
   meta:
     "description" -> { "CFE-3431" }
       string => "Test that custom promises work with unless attribute";
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10217" };
 
   vars:
     "false_variable"
diff --git a/tests/acceptance/30_custom_promise_types/12_multiple_promises.cf b/tests/acceptance/30_custom_promise_types/12_multiple_promises.cf
index 7683de71d9..17fea8d49b 100644
--- a/tests/acceptance/30_custom_promise_types/12_multiple_promises.cf
+++ b/tests/acceptance/30_custom_promise_types/12_multiple_promises.cf
@@ -51,6 +51,8 @@ bundle agent test
   meta:
     "description" -> { "CFE-3443" }
       string => "Test that you can evaluate multiple custom promises of the same type";
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10217" };
 
   vars:
     "test_string"
diff --git a/tests/acceptance/30_custom_promise_types/13_binary_path.cf b/tests/acceptance/30_custom_promise_types/13_binary_path.cf
index ea1ba96939..bf85e2bb73 100644
--- a/tests/acceptance/30_custom_promise_types/13_binary_path.cf
+++ b/tests/acceptance/30_custom_promise_types/13_binary_path.cf
@@ -12,6 +12,9 @@ promise agent binary
 
 bundle agent test
 {
+  meta:
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10217" };
   binary:
     "foobar"
       classes => if_ok("binary_ok");
diff --git a/tests/acceptance/30_custom_promise_types/14_multiple_promise_types_same_module.cf b/tests/acceptance/30_custom_promise_types/14_multiple_promise_types_same_module.cf
index 19525601cf..bc8e134598 100644
--- a/tests/acceptance/30_custom_promise_types/14_multiple_promise_types_same_module.cf
+++ b/tests/acceptance/30_custom_promise_types/14_multiple_promise_types_same_module.cf
@@ -57,6 +57,8 @@ bundle agent test
   meta:
     "description" -> { "CFE-3443" }
       string => "Test that you can use the same custom module for two promise types";
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10217" };
 
   vars:
     "test_string"
diff --git a/tests/acceptance/30_custom_promise_types/15_conflicting_interpreters.cf b/tests/acceptance/30_custom_promise_types/15_conflicting_interpreters.cf
index 09781d7c84..410a7d76c0 100644
--- a/tests/acceptance/30_custom_promise_types/15_conflicting_interpreters.cf
+++ b/tests/acceptance/30_custom_promise_types/15_conflicting_interpreters.cf
@@ -58,6 +58,8 @@ bundle agent test
   meta:
     "description" -> { "CFE-3443" }
       string => "Test that you cannot use a promise module with two different interpreters";
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10217" };
 
   vars:
     "test_string"
diff --git a/tests/acceptance/30_custom_promise_types/22_what_module_gets.cf b/tests/acceptance/30_custom_promise_types/22_what_module_gets.cf
index b64c1a3f4e..8ad75fd22f 100644
--- a/tests/acceptance/30_custom_promise_types/22_what_module_gets.cf
+++ b/tests/acceptance/30_custom_promise_types/22_what_module_gets.cf
@@ -38,6 +38,8 @@ bundle agent test
   meta:
     "description" -> { "CFE-3723" }
       string => "Test that input from cf-agent to promise module matches expected data";
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10217" };
 
   example:
     cfengine::
diff --git a/tests/acceptance/30_custom_promise_types/22_what_module_gets.cf.expected b/tests/acceptance/30_custom_promise_types/22_what_module_gets.cf.expected
index 25d30cdbfe..d06f1bc7c9 100644
--- a/tests/acceptance/30_custom_promise_types/22_what_module_gets.cf.expected
+++ b/tests/acceptance/30_custom_promise_types/22_what_module_gets.cf.expected
@@ -4,7 +4,7 @@ operation=validate_promise
 log_level=info
 promise_type=example
 promiser=Promiser
-line_number=44
+line_number=46
 filename=./30_custom_promise_types/22_what_module_gets.cf
 attribute_attributeName=attributeValue
 
@@ -12,7 +12,7 @@ operation=evaluate_promise
 log_level=info
 promise_type=example
 promiser=Promiser
-line_number=44
+line_number=46
 filename=./30_custom_promise_types/22_what_module_gets.cf
 attribute_attributeName=attributeValue
 
diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_supported.cf b/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_supported.cf
index ed6aff3067..dbcdbd4f5c 100644
--- a/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_supported.cf
+++ b/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_supported.cf
@@ -18,6 +18,8 @@ bundle agent test
   meta:
     "description" -> { "CFE-3433" }
       string => "Test that dry-run can be used with custom promise modules supporting it";
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10217" };
 }
 
 bundle agent check
diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_unsupported.cf b/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_unsupported.cf
index 3d0fdbf645..01cb2f2431 100644
--- a/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_unsupported.cf
+++ b/tests/acceptance/30_custom_promise_types/23_action_policy/dryrun_unsupported.cf
@@ -18,6 +18,8 @@ bundle agent test
   meta:
     "description" -> { "CFE-3433" }
       string => "Test that --dry-run produces errors when used with custom promise modules not supporting it";
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10217" };
 }
 
 bundle agent check
diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_fake_supported.cf b/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_fake_supported.cf
index e6ff2c80f2..7a0ba4207f 100644
--- a/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_fake_supported.cf
+++ b/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_fake_supported.cf
@@ -18,6 +18,8 @@ bundle agent test
   meta:
     "description" -> { "CFE-3433" }
       string => "Test that a bug in a module is reported if it advertises action_policy feature, but doesn't properly implement it";
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10217" };
 }
 
 bundle agent check
diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_supported.cf b/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_supported.cf
index 5030fb32e5..9472c4d3a3 100644
--- a/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_supported.cf
+++ b/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_supported.cf
@@ -18,6 +18,8 @@ bundle agent test
   meta:
     "description" -> { "CFE-3433" }
       string => "Test that action_policy can be used with custom promise modules supporting it";
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10217" };
 }
 
 bundle agent check
diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_unsupported.cf b/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_unsupported.cf
index 18f8620447..52b33ccc1d 100644
--- a/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_unsupported.cf
+++ b/tests/acceptance/30_custom_promise_types/23_action_policy/explicit_warn_unsupported.cf
@@ -18,6 +18,8 @@ bundle agent test
   meta:
     "description" -> { "CFE-3433" }
       string => "Test that action_policy produces errors when used with custom promise modules not supporting it";
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10217" };
 }
 
 bundle agent check
diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_supported.cf b/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_supported.cf
index 7cf0b12c15..b8dd3d28ba 100644
--- a/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_supported.cf
+++ b/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_supported.cf
@@ -18,6 +18,8 @@ bundle agent test
   meta:
     "description" -> { "CFE-3433" }
       string => "Test that --simulate can be used with custom promise modules supporting it";
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10217" };
 }
 
 bundle agent check
diff --git a/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_unsupported.cf b/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_unsupported.cf
index cfbf87327e..1232467af5 100644
--- a/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_unsupported.cf
+++ b/tests/acceptance/30_custom_promise_types/23_action_policy/simulate_unsupported.cf
@@ -18,6 +18,8 @@ bundle agent test
   meta:
     "description" -> { "CFE-3433" }
       string => "Test that --simulate produces errors when used with custom promise modules not supporting it";
+    "test_soft_fail" string => "windows",
+      meta => { "ENT-10217" };
 }
 
 bundle agent check
diff --git a/tests/acceptance/dcs.cf.sub b/tests/acceptance/dcs.cf.sub
index a12db971d5..5182123191 100644
--- a/tests/acceptance/dcs.cf.sub
+++ b/tests/acceptance/dcs.cf.sub
@@ -83,27 +83,24 @@ bundle common G
       "paths[usr_local_bin]" string          => "/usr/local/bin";
       "paths[usr_contrib_bin]" string        => "/usr/contrib/bin";
     windows::
-      "paths[mingw_msys_1_0_bin]" string     => "c:\\mingw\\msys\\1.0\\bin";
-      "paths[msys_1_0_bin]" string           => "c:\\msys\\1.0\\bin";
-      "paths[msys_bin]" string               => "c:\\msys\\bin";
-      "paths[pstools]" string                => "c:\\PSTools";
-      "paths[strawberry_perl_bin]" string    => "c:\\strawberry\\perl\\bin";
+      "paths[msys64_usr_bin]" string         => "c:\\msys64\\usr\\bin";
+      "paths[temp_msys64_usr_bin]" string    => "d:\\a\\_temp\\msys64\\usr\\bin";
       "paths[tool_wrappers]" string          => "$(this.promise_dirname)\\tool_wrappers";
 
     any::
       "paths_indices" slist => getindices("paths");
 
       # dereferenced path of the executable
-      "deref_paths[$(paths[$(paths_indices)])][$(cmds)]" string =>
+      "deref_paths[$(paths[$(paths_indices)])][$(cmds)$(exeext)]" string =>
           filestat("$(paths[$(paths_indices)])$(const.dirsep)$(cmds)$(exeext)",
                    "linktarget");
 
   classes:
       # General commands.
       "$(paths_indices)_$(cmds)$(exeext)" expression =>
-          fileexists("$(deref_paths[$(paths[$(paths_indices)])][$(cmds)])");
+          fileexists("$(deref_paths[$(paths[$(paths_indices)])][$(cmds)$(exeext)])");
       "has_$(cmds)"                       expression =>
-          fileexists("$(deref_paths[$(paths[$(paths_indices)])][$(cmds)])"),
+          fileexists("$(deref_paths[$(paths[$(paths_indices)])][$(cmds)$(exeext)])"),
           scope => "namespace";
 
       # Special cases.
diff --git a/tests/acceptance/testall b/tests/acceptance/testall
index 79cf1d39c2..aac5305646 100755
--- a/tests/acceptance/testall
+++ b/tests/acceptance/testall
@@ -457,7 +457,7 @@ runtest() {
         fi
         if uname | grep MINGW > /dev/null
         then
-            PLATFORM_WORKDIR="$(echo $WORKDIR | sed -e 's%^/\([a-cA-Z]\)/%\1:/%' | sed -e 's%/%\\%g')"
+            PLATFORM_WORKDIR="$(echo $WORKDIR | sed -e 's%^/\([a-zA-Z]\)/%\1:/%' | sed -e 's%/%\\%g')"
             DS="\\"
         else
             PLATFORM_WORKDIR="$WORKDIR"
@@ -733,6 +733,13 @@ export CFENGINE_TEST_OVERRIDE_WORKDIR TEMP CFENGINE_TEST_OVERRIDE_EXTENSION_LIBR
                     ;;
             esac
         done
+        if [ "$GITHUB_ACTIONS" = "true" ] && [ "$RUNNER_OS" = "Windows" ]
+        then
+            # on Github Actions Windows runners, `rm -rf` moves files into /d/d/ directory.
+            # To clean this "Recycle bin", we delete this directory.
+            # Otherwise, runner promptly run out of disk space.
+            rm -rf /d/d/
+        fi
     fi
 
     if [ -z "$QUIET" ]
diff --git a/tests/acceptance/tool_wrappers/template.bat b/tests/acceptance/tool_wrappers/template.bat
index b7a310d004..5beff82862 100644
--- a/tests/acceptance/tool_wrappers/template.bat
+++ b/tests/acceptance/tool_wrappers/template.bat
@@ -1,6 +1,5 @@
 @echo off
-if exist c:\mingw\msys\1.0\bin\sh.exe c:\mingw\msys\1.0\bin\sh.exe -c "%*" & goto end
-if exist c:\msys\1.0\bin\sh.exe c:\msys\1.0\bin\sh.exe -c "%*" & goto end
-if exist c:\msys\bin\sh.exe c:\msys\bin\sh.exe -c "%*" & goto end
+if exist c:\msys64\usr\bin\sh.exe c:\msys64\usr\bin\sh.exe -c "%*" & goto end
+if exist d:\a\_temp\msys64\usr\bin\sh.exe d:\a\_temp\msys64\usr\bin\sh.exe -c "%*" & goto end
 
 :end