diff --git a/tests/acceptance/21_methods/call_methods_using_array_expansion.cf b/tests/acceptance/21_methods/call_methods_using_array_expansion.cf
index 8a9a470c42..d0aaa6476a 100644
--- a/tests/acceptance/21_methods/call_methods_using_array_expansion.cf
+++ b/tests/acceptance/21_methods/call_methods_using_array_expansion.cf
@@ -24,8 +24,7 @@ bundle agent test
 {
   meta:
     "description" -> { "CFE-636" }
-      string => "Check that methods can be called by expanding classic
-                   arrays";
+      string => "Check that methods can be called by expanding classic arrays";
 
   vars:
     "b1" string => "b1";
diff --git a/tests/acceptance/21_methods/method_outcomes.cf b/tests/acceptance/21_methods/method_outcomes.cf
index a8cf60a809..44a1ca6a1a 100644
--- a/tests/acceptance/21_methods/method_outcomes.cf
+++ b/tests/acceptance/21_methods/method_outcomes.cf
@@ -15,8 +15,7 @@ bundle agent main
 
 bundle agent init
 {
-  classes:
-
+  # classes:
   #  "method_FORCE_UNEXPECTED_FAIL" expression => "any";
   vars:
     "method_outcome_classes" slist => classesmatching("method_.*");
diff --git a/tests/acceptance/21_methods/reachable/bundle_usebundle_call_by_arg_defined.cf b/tests/acceptance/21_methods/reachable/bundle_usebundle_call_by_arg_defined.cf
index df779f78e9..51c54b81f8 100644
--- a/tests/acceptance/21_methods/reachable/bundle_usebundle_call_by_arg_defined.cf
+++ b/tests/acceptance/21_methods/reachable/bundle_usebundle_call_by_arg_defined.cf
@@ -14,9 +14,9 @@ bundle agent baz
 bundle agent bar(x)
 {
   methods:
+    # Will call baz, which exists, should work
     "foo" usebundle => "$(x)";
 
-      # Will call baz, which exists, should work
 }
 
 bundle agent main
diff --git a/tests/acceptance/21_methods/reachable/bundle_usebundle_unreachable.cf b/tests/acceptance/21_methods/reachable/bundle_usebundle_unreachable.cf
index 78aef58fcc..51c97ee9d3 100644
--- a/tests/acceptance/21_methods/reachable/bundle_usebundle_unreachable.cf
+++ b/tests/acceptance/21_methods/reachable/bundle_usebundle_unreachable.cf
@@ -16,8 +16,8 @@ bundle agent main
   methods:
     "foo"
       if => "out_of_context",
+      # Should not error because it's unreachable
       usebundle => "bar";
 
-    # Should not error because it's unreachable
     "baz";
 }
diff --git a/tests/acceptance/29_simulate_mode/diff_mode.cf b/tests/acceptance/29_simulate_mode/diff_mode.cf
index a72b6ee53f..26c47f9efd 100644
--- a/tests/acceptance/29_simulate_mode/diff_mode.cf
+++ b/tests/acceptance/29_simulate_mode/diff_mode.cf
@@ -20,10 +20,10 @@ bundle agent test
   meta:
     "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
+      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 9ebdecfa80..fe027cf486 100644
--- a/tests/acceptance/29_simulate_mode/manifest_full_mode.cf
+++ b/tests/acceptance/29_simulate_mode/manifest_full_mode.cf
@@ -20,10 +20,10 @@ bundle agent test
   meta:
     "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
+      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 59c8bdd7c2..9fb130ca71 100644
--- a/tests/acceptance/29_simulate_mode/manifest_mode.cf
+++ b/tests/acceptance/29_simulate_mode/manifest_mode.cf
@@ -20,10 +20,10 @@ bundle agent test
   meta:
     "test_soft_fail"
       string => "(solaris|aix|hpux|windows)",
+      # ENT-6540 exotics fail to delete chroot
+      # ENT-10254 tests fail on Windows due to CRLF
       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/31_tickets/CFE-2367/1/test.cf b/tests/acceptance/31_tickets/CFE-2367/1/test.cf
index 46246763a3..57f246e04d 100644
--- a/tests/acceptance/31_tickets/CFE-2367/1/test.cf
+++ b/tests/acceptance/31_tickets/CFE-2367/1/test.cf
@@ -19,11 +19,10 @@ bundle agent test
   files:
     "$(G.testfile)"
       content => "CFE-2367",
-      unless => fileexists($(testfile));
-
       # testfile is not defined, in the
       # original ticket filed this caused
       # a fatal error
+      unless => fileexists($(testfile));
 }
 
 bundle agent check
diff --git a/tests/acceptance/31_tickets/CFE-2367/2/test.cf b/tests/acceptance/31_tickets/CFE-2367/2/test.cf
index 8be49c5afc..2000b198f6 100644
--- a/tests/acceptance/31_tickets/CFE-2367/2/test.cf
+++ b/tests/acceptance/31_tickets/CFE-2367/2/test.cf
@@ -19,8 +19,6 @@ bundle agent test
   files:
     "$(G.testfile)"
       content => "CFE-2367",
-      unless => and(fileexists($(testfile)));
-
       # testfile is not defined,
       # in the original ticket
       # filed this caused a fatal
@@ -30,6 +28,7 @@ bundle agent test
       # simply test that as in the
       # original case, there is no
       # fatal error.
+      unless => and(fileexists($(testfile)));
 }
 
 bundle agent check
diff --git a/tests/acceptance/31_tickets/ENT-8788/1/main.cf b/tests/acceptance/31_tickets/ENT-8788/1/main.cf
index 3726004b03..3fa1522794 100644
--- a/tests/acceptance/31_tickets/ENT-8788/1/main.cf
+++ b/tests/acceptance/31_tickets/ENT-8788/1/main.cf
@@ -35,14 +35,14 @@ bundle agent test
       create => "false",
       edit_defaults => size("500k"),
       edit_line => insert_file_as_block_relative_to_first_or_last_line(
+        # File with content to insert if not found:
         "$(new_content_file)",
-        # File with content to insert if not found
+        # Relative position to insert content (before|after):
         "before",
-        # Relative position to insert content (before|after)
-        "last",
         # which line match will we insert based on?
+        "last",
+        # Regex to match the line we want to insert relative to:
         "\s+<filter>"
-        # Regex to match the line we want to insert relative to
       );
 }
 
diff --git a/tests/acceptance/31_tickets/ENT-8788/2/main.cf b/tests/acceptance/31_tickets/ENT-8788/2/main.cf
index 8b6662cf3d..0f0a8d70ec 100644
--- a/tests/acceptance/31_tickets/ENT-8788/2/main.cf
+++ b/tests/acceptance/31_tickets/ENT-8788/2/main.cf
@@ -35,14 +35,14 @@ bundle agent test
       create => "false",
       edit_defaults => size("500k"),
       edit_line => insert_file_as_block_relative_to_first_or_last_line(
+        # File with content to insert if not found:
         "$(new_content_file)",
-        # File with content to insert if not found
+        # Relative position to insert content (before|after):
         "before",
-        # Relative position to insert content (before|after)
-        "last",
         # which line match will we insert based on?
+        "last",
+        # Regex to match the line we want to insert relative to:
         "\s+<filter>"
-        # Regex to match the line we want to insert relative to
       );
 }
 
diff --git a/tests/acceptance/dcs.sub.cf b/tests/acceptance/dcs.sub.cf
index 4efc8c4f47..e752cf24c7 100644
--- a/tests/acceptance/dcs.sub.cf
+++ b/tests/acceptance/dcs.sub.cf
@@ -42,16 +42,16 @@ bundle common G
           "env",
           "false",
           "grep",
+          # will override sed on solaris hosts:
           "gsed",
-          # will override sed on solaris hosts
           "gzip",
           "hexdump",
           "ln",
           "ls",
           "mkdir",
           "mkfifo",
+          # AIX equivalent of groupadd:
           "mkgroup",
-          # AIX equivalent of groupadd
           "mock_package_manager",
           "mv",
           "no_fds",