diff --git a/testsuite/tests/lint/common/help/test.out b/testsuite/tests/lint/common/help_linux/test.out
similarity index 68%
rename from testsuite/tests/lint/common/help/test.out
rename to testsuite/tests/lint/common/help_linux/test.out
index b4be3ef4..939fe481 100644
--- a/testsuite/tests/lint/common/help/test.out
+++ b/testsuite/tests/lint/common/help_linux/test.out
@@ -1,7 +1,7 @@
-usage: gnatrefactor(?:\.exe)? \[--help\|-h] \[--help\|-h] tool \[--verbose\|-v] \[--pipe\|-p]\s*
-\s*\[--project\|-P PROJECT] \[--sources\|-S SOURCES \[SOURCES\.\.\.]]\s*
-\s*\[-X nm=val \[nm=val\.\.\.]] \[--from-gnat-warnings\|-fgw\s*
-\s*<file_with_gnat_warnings>]\s*
+usage: gnatrefactor [--help|-h] [--help|-h] tool [--verbose|-v] [--pipe|-p] 
+                   [--project|-P PROJECT] [--sources|-S SOURCES [SOURCES...]] 
+                   [-X nm=val [nm=val...]] [--from-gnat-warnings|-fgw 
+                   <file_with_gnat_warnings>] 
 
 Refactor tools
 
diff --git a/testsuite/tests/lint/common/help/test.sh b/testsuite/tests/lint/common/help_linux/test.sh
similarity index 100%
rename from testsuite/tests/lint/common/help/test.sh
rename to testsuite/tests/lint/common/help_linux/test.sh
diff --git a/testsuite/tests/lint/common/help/test.yaml b/testsuite/tests/lint/common/help_linux/test.yaml
similarity index 60%
rename from testsuite/tests/lint/common/help/test.yaml
rename to testsuite/tests/lint/common/help_linux/test.yaml
index bbbf3881..b60adf6b 100644
--- a/testsuite/tests/lint/common/help/test.yaml
+++ b/testsuite/tests/lint/common/help_linux/test.yaml
@@ -4,4 +4,5 @@ description: Tests the output of the --help flag
 
 driver: shell_script
 
-baseline_regexp: True
+control:
+    - ['SKIP', 'env.build.os.name != "linux"']
diff --git a/testsuite/tests/lint/common/help_windows/test.out b/testsuite/tests/lint/common/help_windows/test.out
new file mode 100644
index 00000000..c2960533
--- /dev/null
+++ b/testsuite/tests/lint/common/help_windows/test.out
@@ -0,0 +1,22 @@
+usage: gnatrefactor.exe [--help|-h] [--help|-h] tool [--verbose|-v] [--pipe|-p] 
+                       [--project|-P PROJECT] [--sources|-S SOURCES 
+                       [SOURCES...]] [-X nm=val [nm=val...]] 
+                       [--from-gnat-warnings|-fgw <file_with_gnat_warnings>] 
+
+Refactor tools
+
+positional arguments:
+   tool  array_aggregates
+   
+optional arguments:
+   --help, -h                  Show this help message
+   --help, -h                  Help
+   --verbose, -v               Print traces
+   --pipe, -p                  Print the result to stdout instead of editing the
+                                files on disk
+   --project, -P               Project
+   --sources, -S               Source files to refactor
+   -X                          Specify an external reference for Project Files
+   --from-gnat-warnings, -fgw  File with all obsolescent syntax GNAT warnings
+   
+
diff --git a/testsuite/tests/lint/common/help_windows/test.sh b/testsuite/tests/lint/common/help_windows/test.sh
new file mode 100755
index 00000000..09ecd4b3
--- /dev/null
+++ b/testsuite/tests/lint/common/help_windows/test.sh
@@ -0,0 +1 @@
+gnatrefactor --help
diff --git a/testsuite/tests/lint/common/help_windows/test.yaml b/testsuite/tests/lint/common/help_windows/test.yaml
new file mode 100644
index 00000000..ca074aa5
--- /dev/null
+++ b/testsuite/tests/lint/common/help_windows/test.yaml
@@ -0,0 +1,8 @@
+title: help
+
+description: Tests the output of the --help flag
+
+driver: shell_script
+
+control:
+    - ['SKIP', 'env.build.os.name != "windows"']