diff --git a/testsuite/tests/lint/array_aggregates/apply_edits/test.sh b/testsuite/tests/lint/array_aggregates/apply_edits/test.sh
index 78edd9a8..35131ccf 100755
--- a/testsuite/tests/lint/array_aggregates/apply_edits/test.sh
+++ b/testsuite/tests/lint/array_aggregates/apply_edits/test.sh
@@ -2,4 +2,4 @@ rm -rf output
 mkdir output
 cp -a test.gpr main.adb output
 gnatrefactor array_aggregates -P output/test.gpr
-diff expected output
+diff expected output --strip-trailing-cr
diff --git a/testsuite/tests/lint/array_aggregates/empty/test.yaml b/testsuite/tests/lint/array_aggregates/empty/test.yaml
index bf5a5a3c..a370f6a1 100644
--- a/testsuite/tests/lint/array_aggregates/empty/test.yaml
+++ b/testsuite/tests/lint/array_aggregates/empty/test.yaml
@@ -6,3 +6,4 @@ description: |4
 
 driver: shell_script
 
+canonicalize_backslashes: True
diff --git a/testsuite/tests/lint/array_aggregates/multi_element/test.yaml b/testsuite/tests/lint/array_aggregates/multi_element/test.yaml
index 908d137a..20e9fd95 100644
--- a/testsuite/tests/lint/array_aggregates/multi_element/test.yaml
+++ b/testsuite/tests/lint/array_aggregates/multi_element/test.yaml
@@ -6,3 +6,4 @@ description: |4
 
 driver: shell_script
 
+canonicalize_backslashes: True
diff --git a/testsuite/tests/lint/array_aggregates/one_element/test.yaml b/testsuite/tests/lint/array_aggregates/one_element/test.yaml
index 49ea80b2..cbf75cd6 100644
--- a/testsuite/tests/lint/array_aggregates/one_element/test.yaml
+++ b/testsuite/tests/lint/array_aggregates/one_element/test.yaml
@@ -6,3 +6,4 @@ description: |4
 
 driver: shell_script
 
+canonicalize_backslashes: True
diff --git a/testsuite/tests/lint/common/help/test.out b/testsuite/tests/lint/common/help/test.out
index 51575da5..2f079275 100644
--- a/testsuite/tests/lint/common/help/test.out
+++ b/testsuite/tests/lint/common/help/test.out
@@ -1,5 +1,5 @@
-usage: gnatrefactor [--help|-h] [--help|-h] tool [--verbose|-v] [--pipe|-p] 
-                   [--project|-P PROJECT] 
+usage: gnatrefactor(?:\.exe)? \[--help\|-h] \[--help\|-h] tool \[--verbose\|-v] \[--pipe\|-p] 
+\s+\[--project\|-P PROJECT] 
 
 Refactor tools
 
diff --git a/testsuite/tests/lint/common/help/test.yaml b/testsuite/tests/lint/common/help/test.yaml
index cd75c6a9..bbbf3881 100644
--- a/testsuite/tests/lint/common/help/test.yaml
+++ b/testsuite/tests/lint/common/help/test.yaml
@@ -3,3 +3,5 @@ title: help
 description: Tests the output of the --help flag
 
 driver: shell_script
+
+baseline_regexp: True