diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index fa84a95605..bc6dea9f86 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -178,7 +178,7 @@ test1426 test1427 test1428 test1429 test1430 test1431 test1432 test1433 \
test1434 test1435 test1436 test1437 test1438 test1439 test1440 test1441 \
test1442 test1443 test1444 test1445 test1446 test1447 test1448 test1449 \
test1450 test1451 test1452 test1453 test1454 test1455 test1456 test1457 \
-test1458 test1459 test1460 \
+test1458 test1459 test1460 test1461 test1462 test1463 test1464 \
\
test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \
test1508 test1509 test1510 test1511 test1512 test1513 test1514 test1515 \
diff --git a/tests/data/test1461 b/tests/data/test1461
new file mode 100644
index 0000000000..4b8f6c4101
--- /dev/null
+++ b/tests/data/test1461
@@ -0,0 +1,53 @@
+
+
+
+--help
+
+
+
+#
+# Server-side
+
+
+
+#
+# Client-side
+
+
+none
+
+
+curl important --help
+
+
+--help
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+0
+
+
+Usage: curl [options...]
+ -d, --data HTTP POST data
+ -f, --fail Fail silently (no output at all) on HTTP errors
+ -h, --help Get help for commands
+ -i, --include Include protocol response headers in the output
+ -o, --output Write to file instead of stdout
+ -O, --remote-name Write output to a file named as the remote file
+ -s, --silent Silent mode
+ -T, --upload-file Transfer local FILE to destination
+ -u, --user Server user and password
+ -A, --user-agent Send User-Agent to server
+ -v, --verbose Make the operation more talkative
+ -V, --version Show version number and quit
+
+This is not the full help, this menu is stripped into categories.
+Use "--help category" to get an overview of all categories.
+For all options use the manual or "--help all".
+
+
+
diff --git a/tests/data/test1462 b/tests/data/test1462
new file mode 100644
index 0000000000..a9e7af0a6d
--- /dev/null
+++ b/tests/data/test1462
@@ -0,0 +1,61 @@
+
+
+
+--help
+
+
+
+#
+# Server-side
+
+
+
+#
+# Client-side
+
+
+none
+
+
+curl invalid category --help
+
+
+--help sdfafdsfadsfsd
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+0
+
+
+Usage: curl [options...]
+Invalid category provided, here is a list of all categories:
+
+ auth Different types of authentication methods
+ connection Low level networking operations
+ curl The command line tool itself
+ dns General DNS options
+ file FILE protocol options
+ ftp FTP protocol options
+ http HTTP and HTTPS protocol options
+ imap IMAP protocol options
+ misc Options that don't fit into any other category
+ output The output of curl
+ pop3 POP3 protocol options
+ post HTTP Post specific options
+ proxy All options related to proxies
+ scp SCP protocol options
+ sftp SFTP protocol options
+ smtp SMTP protocol options
+ ssh SSH protocol options
+ telnet TELNET protocol options
+ tftp TFTP protocol options
+ tls All TLS/SSL related options
+ upload All options for uploads
+ verbose Options related to any kind of command line output of curl
+
+
+
diff --git a/tests/data/test1463 b/tests/data/test1463
new file mode 100644
index 0000000000..7e1fe9b840
--- /dev/null
+++ b/tests/data/test1463
@@ -0,0 +1,44 @@
+
+
+
+FILE
+--help
+
+
+
+#
+# Server-side
+
+
+
+#
+# Client-side
+
+
+none
+
+
+file
+
+
+curl file category --help
+
+
+--help file
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+0
+
+
+Usage: curl [options...]
+file: FILE protocol options
+ -I, --head Show document info only
+ -r, --range Retrieve only the bytes within RANGE
+
+
+
diff --git a/tests/data/test1464 b/tests/data/test1464
new file mode 100644
index 0000000000..167e80d6d5
--- /dev/null
+++ b/tests/data/test1464
@@ -0,0 +1,44 @@
+
+
+
+FILE
+--help
+
+
+
+#
+# Server-side
+
+
+
+#
+# Client-side
+
+
+none
+
+
+file
+
+
+curl file category --help with lower/upper mix
+
+
+--help fIlE
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+0
+
+
+Usage: curl [options...]
+file: FILE protocol options
+ -I, --head Show document info only
+ -r, --range Retrieve only the bytes within RANGE
+
+
+