Index: tests/tlsIO.test
==================================================================
--- tests/tlsIO.test
+++ tests/tlsIO.test
@@ -260,35 +260,35 @@
     list [catch {tls::socket -server foo} msg] $msg
 } {1 {wrong # args: should be "tls::socket -server command ?options? port"}}
 
 test tlsIO-1.3 {arg parsing for socket command} {socket} {
     list [catch {tls::socket -myaddr} msg] $msg
-} {1 {wrong # args: should be "tls::socket ?options? host port"}}
+} {1 {"-myaddr" option must be followed by value}}
 
 test tlsIO-1.4 {arg parsing for socket command} {socket} {
     list [catch {tls::socket -myaddr 127.0.0.1} msg] $msg
 } {1 {wrong # args: should be "tls::socket ?options? host port"}}
 
 test tlsIO-1.5 {arg parsing for socket command} {socket} {
     list [catch {tls::socket -myport} msg] $msg
-} {1 {wrong # args: should be "tls::socket ?options? host port"}}
+} {1 {"-myport" option must be followed by value}}
 
 test tlsIO-1.6 {arg parsing for socket command} {socket} {
     list [catch {tls::socket -myport xxxx} msg] $msg
 } {1 {wrong # args: should be "tls::socket ?options? host port"}}
 
 test tlsIO-1.7 {arg parsing for socket command} {socket} {
     list [catch {tls::socket -myport 2522} msg] $msg
 } {1 {wrong # args: should be "tls::socket ?options? host port"}}
 
-test tlsIO-1.8 {arg parsing for socket command} {socket} {
+test tlsIO-1.8 {arg parsing for socket command} -constraints {socket} -body {
     list [catch {tls::socket -froboz} msg] $msg
-} {1 {wrong # args: should be "tls::socket ?options? host port"}}
+} -match glob -result {1 {bad option "-froboz": must be one of *}}
 
-test tlsIO-1.9 {arg parsing for socket command} {socket} {
+test tlsIO-1.9 {arg parsing for socket command} -constraints {socket} -body {
     list [catch {tls::socket -server foo -myport 2521 3333} msg] $msg
-} {1 {wrong # args: should be "tls::socket -server command ?options? port"}}
+} -match glob -result {1 {bad option "-myport": must be one of *}}
 
 test tlsIO-1.10 {arg parsing for socket command} {socket} {
     list [catch {tls::socket host 2528 -junk} msg] $msg
 } {1 {wrong # args: should be "tls::socket ?options? host port"}}