1 files changed, 8 insertions, 18 deletions
diff --git a/tk/tests/id.test b/tk/tests/id.test
index 91d75c6112a..c5a19f98fed 100644
--- a/tk/tests/id.test
+++ b/tk/tests/id.test
@@ -8,24 +8,14 @@
 #
 # RCS: @(#) $Id$
 
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-
-if {[string compare testwrapper [info commands testwrapper]] != 0} {
-    puts "This application hasn't been compiled with the testwrapper command,"
-    puts "therefore I am skipping all of these tests."
-    ::tcltest::cleanupTests
-    return
-}
-
-foreach i [winfo children .] {
-    destroy $i
-}
-wm geometry . {}
-raise .
-
-test id-1.1 {WindowIdCleanup, delaying window release} {unixOnly} {
+package require tcltest 2.1
+namespace import -force tcltest::configure
+namespace import -force tcltest::testsDirectory
+configure -testdir [file join [pwd] [file dirname [info script]]]
+configure -loadfile [file join [testsDirectory] constraints.tcl]
+tcltest::loadTestedCommands
+
+test id-1.1 {WindowIdCleanup, delaying window release} {unixOnly testwrapper} {
     bind all <Destroy> {lappend x %W}
     catch {unset map}
     frame .f