--- a/modules/comm/comm.test	2024-11-02 20:23:21.687981633 +0100
+++ b/modules/comm/comm.test	2024-11-02 20:23:34.055823008 +0100
@@ -265,7 +265,7 @@
 
 # ------------------------------------------------------------------------
 
-test comm-6.0 {secured communication via tls package} hastls {
+test comm-6.0 {secured communication via tls package} 0 {
     # Setup secured channel in main process.
     tls::init \
 	-keyfile  [tcllibPath devtools/receiver.key] \
--- a/modules/http/autoproxy.test	2024-11-02 20:24:32.014089148 +0100
+++ b/modules/http/autoproxy.test	2024-11-02 20:25:18.113509819 +0100
@@ -180,7 +180,7 @@
 } -result "Invalid TLS package option 'dummy'. Must be 'tls' or 'twapi'" -returnCodes error
 
 test autoproxy-2.0.0 "autoproxy::tls_socket (tls) with proxy" -constraints {
-    have_tls
+    0
 } -setup {
     packageReset
     package require http
--- a/modules/http/autoproxytls.test	2024-11-02 20:46:42.978304258 +0100
+++ b/modules/http/autoproxytls.test	2024-11-02 20:48:26.620984610 +0100
@@ -186,7 +186,7 @@
 }
 
 test autoproxy-tls-1.1.1 "autoproxy::tls_socket (tls) with proxy and http proxy config" -constraints {
-    have_tls
+    0
 } -setup {
     packageReset
     autoproxy::configure -proxy_host proxy.tcllib.test -proxy_port 4319
--- a/modules/pop3/pop3.test	2024-11-02 20:49:19.431312311 +0100
+++ b/modules/pop3/pop3.test	2024-11-02 20:49:48.197945678 +0100
@@ -579,7 +579,7 @@
     set msg
 } {POP3 UIDL ERROR:  unknown command 'UIDL'}
 
-test pop3-7.0 {open pop3 channel secured via package tls} hastls {
+test pop3-7.0 {open pop3 channel secured via package tls} 0 {
     dialog::shutdown
     dialog::setup server {Pop3 Fake Server} 1
 
--- a/modules/websocket/websocket.test	2024-11-03 09:46:47.851212270 +0100
+++ b/modules/websocket/websocket.test	2024-11-03 09:49:09.262647901 +0100
@@ -75,7 +75,7 @@
 set wsUrl ws://ws.ifelse.io
 set expectNum 2
 
-test example-1.1 "Open a websocket" -constraints {} -setup {
+test example-1.1 "Open a websocket" -constraints { 0 } -setup {
     wsResetSleep
     wsResetHandler
 } -body {
@@ -94,7 +94,7 @@
 SOCKET text {Request served by *}
 }
 
-test example-1.2 "Close a websocket" -constraints {} -setup {
+test example-1.2 "Close a websocket" -constraints { 0 } -setup {
     wsResetHandler
     wsResetSleep
     wsExpectHandler $expectNum
@@ -115,7 +115,7 @@
 SOCKET disconnect {Disconnected from remote end}
 }
 
-test example-1.3 "Open second websocket - require different socket" -constraints {} -setup {
+test example-1.3 "Open second websocket - require different socket" -constraints { 0 } -setup {
     wsResetSleep
     wsResetHandler
     wsExpectHandler $expectNum
@@ -138,7 +138,7 @@
     wsResetHandler
 } -match glob -result {Sockets differ: *}
 
-test example-1.4 "Open second websocket - usual server return" -constraints {} -setup {
+test example-1.4 "Open second websocket - usual server return" -constraints { 0 } -setup {
     wsResetSleep
     wsResetHandler
     wsExpectHandler $expectNum
@@ -165,7 +165,7 @@
 SOCKET text {Request served by *}
 }
 
-test example-2.1 "Send a message" -constraints {} -setup {
+test example-2.1 "Send a message" -constraints { 0 } -setup {
     wsResetHandler
     wsResetSleep
     wsExpectHandler $expectNum
--- a/modules/hook/hook.test	2026-03-06 16:11:41.444445375 +0100
+++ b/modules/hook/hook.test	2026-03-06 16:13:38.776027335 +0100
@@ -450,7 +450,7 @@
 } -cleanup {
     cleanup
 } -result [tcltest::byConstraint {
-    tcl9plus {{{S1 <H1> {} O1} {simulated error} {-code 1 -level 0 -errorstack {INNER {returnImm {simulated error} {}} UP 1 CALL {::hook::call S1 <H1>}} -errorcode NONE}}}
+    tcl9plus {{{S1 <H1> {} O1} {simulated error} {-code 1 -level 0 -errorstack {INNER {error {simulated error}} UP 1 CALL {::hook::call S1 <H1>}} -errorcode NONE}}}
     tcl8.6.10plus {{{S1 <H1> {} O1} {simulated error} {-code 1 -level 0 -errorstack {INNER {error {simulated error}} UP 1 CALL {::hook::call S1 <H1>}} -errorcode NONE}}}
     tcl8.6not10   {{{S1 <H1> {} O1} {simulated error} {-code 1 -level 0 -errorstack {INNER {error {simulated error}} UP 1 CALL {call S1 <H1>}} -errorcode NONE}}}
     tcl8.5only   {{{S1 <H1> {} O1} {simulated error} {-code 1 -level 0 -errorcode NONE}}}
@@ -467,7 +467,7 @@
 } -cleanup {
     cleanup
 } -result [tcltest::byConstraint {
-    tcl9plus {{{S1 <H1> O1 {}} {S1 <H1> O3 {}}} {{{S1 <H1> {} O2} {simulated error} {-code 1 -level 0 -errorstack {INNER {returnImm {simulated error} {}} UP 1 CALL {::hook::call S1 <H1>}} -errorcode NONE}}}}
+    tcl9plus {{{S1 <H1> O1 {}} {S1 <H1> O3 {}}} {{{S1 <H1> {} O2} {simulated error} {-code 1 -level 0 -errorstack {INNER {error {simulated error}} UP 1 CALL {::hook::call S1 <H1>}} -errorcode NONE}}}}
     tcl8.6.10plus {{{S1 <H1> O1 {}} {S1 <H1> O3 {}}} {{{S1 <H1> {} O2} {simulated error} {-code 1 -level 0 -errorstack {INNER {error {simulated error}} UP 1 CALL {::hook::call S1 <H1>}} -errorcode NONE}}}}
     tcl8.6not10   {{{S1 <H1> O1 {}} {S1 <H1> O3 {}}} {{{S1 <H1> {} O2} {simulated error} {-code 1 -level 0 -errorstack {INNER {error {simulated error}} UP 1 CALL {call S1 <H1>}} -errorcode NONE}}}}
     tcl8.5only   {{{S1 <H1> O1 {}} {S1 <H1> O3 {}}} {{{S1 <H1> {} O2} {simulated error} {-code 1 -level 0 -errorcode NONE}}}}