diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index f235940811..818ee08524 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -95,7 +95,7 @@ test643 test645 test646 test647 test648 test649 test650 test651 \
test652 test653 test654 test655 test656 test658 test659 test660 test661 \
test662 test663 test664 test665 test666 test667 test668 test669 \
test670 test671 test672 test673 test674 test675 test676 test677 test678 \
-test679 test680 test681 \
+test679 test680 test681 test682 test683 test684 test685 \
\
test700 test701 test702 test703 test704 test705 test706 test707 test708 \
test709 test710 test711 test712 test713 test714 test715 test716 test717 \
diff --git a/tests/data/test682 b/tests/data/test682
new file mode 100644
index 0000000000..dfe076e5e7
--- /dev/null
+++ b/tests/data/test682
@@ -0,0 +1,53 @@
+
+
+
+HTTP
+netrc
+
+
+#
+# Server-side
+
+
+HTTP/1.1 200 OK
+Date: Fri, 05 Aug 2022 10:09:00 GMT
+Server: test-server/fake
+Content-Type: text/plain
+Content-Length: 6
+Connection: close
+
+-foo-
+
+
+
+#
+# Client-side
+
+
+http
+
+
+netrc with multiple logins - pick first
+
+
+--netrc-optional --netrc-file log/netrc%TESTNUMBER http://user1@%HOSTIP:%HTTPPORT/
+
+
+machine %HOSTIP login user1 password passwd1
+machine %HOSTIP login user2 password passwd2
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+GET / HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user1:passwd1]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
+
+
+
diff --git a/tests/data/test683 b/tests/data/test683
new file mode 100644
index 0000000000..cf6ea44733
--- /dev/null
+++ b/tests/data/test683
@@ -0,0 +1,53 @@
+
+
+
+HTTP
+netrc
+
+
+#
+# Server-side
+
+
+HTTP/1.1 200 OK
+Date: Fri, 05 Aug 2022 10:09:00 GMT
+Server: test-server/fake
+Content-Type: text/plain
+Content-Length: 6
+Connection: close
+
+-foo-
+
+
+
+#
+# Client-side
+
+
+http
+
+
+netrc with multiple logins - pick second
+
+
+--netrc-optional --netrc-file log/netrc%TESTNUMBER http://user2@%HOSTIP:%HTTPPORT/
+
+
+machine %HOSTIP login user1 password passwd1
+machine %HOSTIP login user2 password passwd2
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+GET / HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user2:passwd2]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
+
+
+
diff --git a/tests/data/test684 b/tests/data/test684
new file mode 100644
index 0000000000..d7391a1319
--- /dev/null
+++ b/tests/data/test684
@@ -0,0 +1,52 @@
+
+
+
+HTTP
+netrc
+
+
+#
+# Server-side
+
+
+HTTP/1.1 200 OK
+Date: Fri, 05 Aug 2022 10:09:00 GMT
+Server: test-server/fake
+Content-Type: text/plain
+Content-Length: 6
+Connection: close
+
+-foo-
+
+
+
+#
+# Client-side
+
+
+http
+
+
+netrc with no login
+
+
+--netrc-optional --netrc-file log/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/
+
+
+machine %HOSTIP password 5up3r53cr37
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+GET / HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[:5up3r53cr37]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
+
+
+
diff --git a/tests/data/test685 b/tests/data/test685
new file mode 100644
index 0000000000..ba520bd542
--- /dev/null
+++ b/tests/data/test685
@@ -0,0 +1,52 @@
+
+
+
+HTTP
+netrc
+
+
+#
+# Server-side
+
+
+HTTP/1.1 200 OK
+Date: Fri, 05 Aug 2022 10:09:00 GMT
+Server: test-server/fake
+Content-Type: text/plain
+Content-Length: 6
+Connection: close
+
+-foo-
+
+
+
+#
+# Client-side
+
+
+http
+
+
+netrc with no login - provided user
+
+
+--netrc-optional --netrc-file log/netrc%TESTNUMBER http://user@%HOSTIP:%HTTPPORT/
+
+
+machine %HOSTIP password 5up3r53cr37
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+
+GET / HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Authorization: Basic %b64[user:5up3r53cr37]b64%
+User-Agent: curl/%VERSION
+Accept: */*
+
+
+