--- modules/struct/sets.test.orig	Sun Jan 21 23:15:59 2007
+++ modules/struct/sets.test	Fri Mar  2 12:34:05 2007
@@ -92,7 +92,12 @@
 	}
 	tcl {
 	    proc Nothing {} {
-		return [tcltest::wrongNumArgs {::struct::set} {cmd args} 0]
+		if {[package vsatisfies [package present Tcl] 8.5]} {
+		    set setop_msg setop
+		} else {
+		    set setop_msg ::struct::set
+		}
+		return [tcltest::wrongNumArgs $setop_msg {cmd args} 0]
 	    }
 
 	    proc tmWrong {m loarg n} {
