156 files changed, 288 insertions, 234 deletions

diff --git a/doc/Tcl_Main.3 b/doc/Tcl_Main.3
index 49d5ecf..62ceeab 100644
--- a/doc/Tcl_Main.3
+++ b/doc/Tcl_Main.3
@@ -79,7 +79,7 @@ against the standard Tcl library.  Extensions (stub-enabled or
 not) are not intended to call \fBTcl_Main\fR.
 .PP
 \fBTcl_Main\fR is not thread-safe.  It should only be called by
-a single thread of a multi-threaded application.  This
+a single main thread of a multi-threaded application.  This
 restriction is not a problem with normal use described above.
 .PP
 \fBTcl_Main\fR and therefore all applications based upon it, like
@@ -112,7 +112,7 @@ The file name and encoding values managed by the routines
 \fBTcl_SetStartupScript\fR and \fBTcl_GetStartupScript\fR
 are stored per-thread.  Although the storage and retrieval
 functions of these routines work in any thread, only those
-calls in the same thread as \fBTcl_Main\fR can have
+calls in the same main thread as \fBTcl_Main\fR can have
 any influence on it.
 .PP
 The caller of \fBTcl_Main\fR may call \fBTcl_SetStartupScript\fR
@@ -126,7 +126,7 @@ a \fIstartup script\fR, and \fIname\fR is taken to be the name
 of the encoding of the contents of that file.  \fBTcl_Main\fR
 then calls \fBTcl_SetStartupScript\fR with these values.
 .PP
-\fBTcl_Main\fR then defines in its interpreter
+\fBTcl_Main\fR then defines in its main interpreter
 the Tcl variables \fIargc\fR, \fIargv\fR, \fIargv0\fR, and
 \fItcl_interactive\fR, as described in the documentation for \fBtclsh\fR.
 .PP
@@ -154,9 +154,9 @@ When the \fIappInitProc\fR is finished, \fBTcl_Main\fR calls
 been requested, if any.  If a startup script has been provided,
 \fBTcl_Main\fR attempts to evaluate it.  Otherwise, interactive
 mode begins with examination of the variable \fItcl_rcFileName\fR
-in the interpreter.  If that variable exists and holds the
+in the main interpreter.  If that variable exists and holds the
 name of a readable file, the contents of that file are evaluated
-in the interpreter.  Then interactive operations begin,
+in the main interpreter.  Then interactive operations begin,
 with prompts and command evaluation results written to the standard
 output channel, and commands read from the standard input channel
 and then evaluated.  The prompts written to the standard output
@@ -164,7 +164,7 @@ channel may be customized by defining the Tcl variables \fItcl_prompt1\fR
 and \fItcl_prompt2\fR as described in the documentation for \fBtclsh\fR.
 The prompts and command evaluation results are written to the standard
 output channel only if the Tcl variable \fItcl_interactive\fR in the
-interpreter holds a non-zero integer value.
+main interpreter holds a non-zero integer value.
 .PP
 \fBTcl_SetMainLoop\fR allows setting an event loop procedure to be run.
 This allows, for example, Tk to be dynamically loaded and set its event
diff --git a/doc/tcltest.n b/doc/tcltest.n
index a1934eb..25e5e5e 100644
--- a/doc/tcltest.n
+++ b/doc/tcltest.n
@@ -1145,7 +1145,7 @@ Here is a sketch of a sample test file illustrating those points:
 .RS
 .PP
 .CS
-package require tcltest 2.2
+package require tcltest 2.5
 eval \fB::tcltest::configure\fR $argv
 package require example
 namespace eval ::example::test {
@@ -1179,8 +1179,8 @@ Here is a sketch of a sample test suite main script:
 .RS
 .PP
 .CS
-package require Tcl 8.4
-package require tcltest 2.2
+package require Tcl 8.6
+package require tcltest 2.5
 package require example
 \fB::tcltest::configure\fR -testdir \e
         [file dirname [file normalize [info script]]]
diff --git a/macosx/Tcl.xcode/project.pbxproj b/macosx/Tcl.xcode/project.pbxproj
index e9a12b9..d7d23fb 100644
--- a/macosx/Tcl.xcode/project.pbxproj
+++ b/macosx/Tcl.xcode/project.pbxproj
@@ -1904,7 +1904,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
-			shellScript = "if [ \"${ACTION:-build}\" == \"build\" ]; then\nif [ -z \"${HOME}\" ]; then export HOME=\"$(echo ~)\"; fi\ncd \"${TARGET_TEMP_DIR}\"; rm -rf \"${DERIVED_FILE_DIR}\"; mkdir -p \"${DERIVED_FILE_DIR}\"\nprintf '%s%s%s%s%s' '\npackage require tcltest 2.2\nnamespace import tcltest::*\nconfigure -testdir [file normalize {' \"${TCL_SRCROOT}\" '/tests}]\nconfigure -tmpdir [file normalize {' \"${DERIVED_FILE_DIR}\" '}]\nconfigure -verbose [concat [configure -verbose] line]\nrunAllTests\n' | \"${TEST_RIG}\"; TEST_RIG_RESULT=$?\n[ ${TEST_RIG_RESULT} -ne 0 ] && echo \"tcltest:0: error: tcltest exited abnormally with code ${TEST_RIG_RESULT}.\"\nexit ${TEST_RIG_RESULT}\nfi";
+			shellScript = "if [ \"${ACTION:-build}\" == \"build\" ]; then\nif [ -z \"${HOME}\" ]; then export HOME=\"$(echo ~)\"; fi\ncd \"${TARGET_TEMP_DIR}\"; rm -rf \"${DERIVED_FILE_DIR}\"; mkdir -p \"${DERIVED_FILE_DIR}\"\nprintf '%s%s%s%s%s' '\npackage require tcltest 2.5\nnamespace import tcltest::*\nconfigure -testdir [file normalize {' \"${TCL_SRCROOT}\" '/tests}]\nconfigure -tmpdir [file normalize {' \"${DERIVED_FILE_DIR}\" '}]\nconfigure -verbose [concat [configure -verbose] line]\nrunAllTests\n' | \"${TEST_RIG}\"; TEST_RIG_RESULT=$?\n[ ${TEST_RIG_RESULT} -ne 0 ] && echo \"tcltest:0: error: tcltest exited abnormally with code ${TEST_RIG_RESULT}.\"\nexit ${TEST_RIG_RESULT}\nfi";
 			showEnvVarsInLog = 0;
 		};
 		F97AF02F0B665DA900310EA2 /* Build Tcl */ = {
diff --git a/macosx/Tcl.xcodeproj/project.pbxproj b/macosx/Tcl.xcodeproj/project.pbxproj
index e72bfe3..1d200a0 100644
--- a/macosx/Tcl.xcodeproj/project.pbxproj
+++ b/macosx/Tcl.xcodeproj/project.pbxproj
@@ -1904,7 +1904,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
-			shellScript = "if [ \"${ACTION:-build}\" == \"build\" ]; then\nif [ -z \"${HOME}\" ]; then export HOME=\"$(echo ~)\"; fi\ncd \"${TARGET_TEMP_DIR}\"; rm -rf \"${DERIVED_FILE_DIR}\"; mkdir -p \"${DERIVED_FILE_DIR}\"\nprintf '%s%s%s%s%s' '\npackage require tcltest 2.2\nnamespace import tcltest::*\nconfigure -testdir [file normalize {' \"${TCL_SRCROOT}\" '/tests}]\nconfigure -tmpdir [file normalize {' \"${DERIVED_FILE_DIR}\" '}]\nconfigure -verbose [concat [configure -verbose] line]\nrunAllTests\n' | \"${TEST_RIG}\"; TEST_RIG_RESULT=$?\n[ ${TEST_RIG_RESULT} -ne 0 ] && echo \"tcltest:0: error: tcltest exited abnormally with code ${TEST_RIG_RESULT}.\"\nexit ${TEST_RIG_RESULT}\nfi";
+			shellScript = "if [ \"${ACTION:-build}\" == \"build\" ]; then\nif [ -z \"${HOME}\" ]; then export HOME=\"$(echo ~)\"; fi\ncd \"${TARGET_TEMP_DIR}\"; rm -rf \"${DERIVED_FILE_DIR}\"; mkdir -p \"${DERIVED_FILE_DIR}\"\nprintf '%s%s%s%s%s' '\npackage require tcltest 2.5\nnamespace import tcltest::*\nconfigure -testdir [file normalize {' \"${TCL_SRCROOT}\" '/tests}]\nconfigure -tmpdir [file normalize {' \"${DERIVED_FILE_DIR}\" '}]\nconfigure -verbose [concat [configure -verbose] line]\nrunAllTests\n' | \"${TEST_RIG}\"; TEST_RIG_RESULT=$?\n[ ${TEST_RIG_RESULT} -ne 0 ] && echo \"tcltest:0: error: tcltest exited abnormally with code ${TEST_RIG_RESULT}.\"\nexit ${TEST_RIG_RESULT}\nfi";
 			showEnvVarsInLog = 0;
 		};
 		F97AF02F0B665DA900310EA2 /* Build Tcl */ = {
diff --git a/tests/aaa_exit.test b/tests/aaa_exit.test
index a8aa6fc..d4d2a7c 100644
--- a/tests/aaa_exit.test
+++ b/tests/aaa_exit.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/append.test b/tests/append.test
index 0487f5c..ef4a194 100644
--- a/tests/append.test
+++ b/tests/append.test
@@ -12,7 +12,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 unset -nocomplain x
diff --git a/tests/appendComp.test b/tests/appendComp.test
index fcbc32a..66941a9 100644
--- a/tests/appendComp.test
+++ b/tests/appendComp.test
@@ -12,7 +12,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 catch {unset x}
diff --git a/tests/apply.test b/tests/apply.test
index 88f63fd..227d3c1 100644
--- a/tests/apply.test
+++ b/tests/apply.test
@@ -13,7 +13,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2.2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/assocd.test b/tests/assocd.test
index edf55c4..7d89daa 100644
--- a/tests/assocd.test
+++ b/tests/assocd.test
@@ -11,8 +11,10 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2
-namespace import ::tcltest::*
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
+}
 
 ::tcltest::loadTestedCommands
 catch [list package require -exact Tcltest [info patchlevel]]
diff --git a/tests/async.test b/tests/async.test
index ac3c08c..ad058a0 100644
--- a/tests/async.test
+++ b/tests/async.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/autoMkindex.test b/tests/autoMkindex.test
index 3e986c1..8662888 100644
--- a/tests/autoMkindex.test
+++ b/tests/autoMkindex.test
@@ -10,7 +10,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/basic.test b/tests/basic.test
index 089f154..38ea11e 100644
--- a/tests/basic.test
+++ b/tests/basic.test
@@ -15,8 +15,10 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2
-namespace import ::tcltest::*
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
+}
 
 ::tcltest::loadTestedCommands
 catch [list package require -exact Tcltest [info patchlevel]]
diff --git a/tests/binary.test b/tests/binary.test
index b2a2a40..cf3195f 100644
--- a/tests/binary.test
+++ b/tests/binary.test
@@ -11,7 +11,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 testConstraint bigEndian [expr {$tcl_platform(byteOrder) eq "bigEndian"}]
diff --git a/tests/case.test b/tests/case.test
index 0aba5cd..87cb2c8 100644
--- a/tests/case.test
+++ b/tests/case.test
@@ -17,7 +17,7 @@ if {![llength [info commands case]]} {
 }
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/chan.test b/tests/chan.test
index 7d32a8f..2ca0142 100644
--- a/tests/chan.test
+++ b/tests/chan.test
@@ -8,7 +8,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/chanio.test b/tests/chanio.test
index 820fd8a..daacdd0 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -14,11 +14,16 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
 }
 
 namespace eval ::tcl::test::io {
-    namespace import ::tcltest::*
+
+    if {"::tcltest" ni [namespace children]} {
+	package require tcltest 2.5
+	namespace import -force ::tcltest::*
+    }
 
     variable umaskValue
     variable path
diff --git a/tests/clock.test b/tests/clock.test
index 9052990..c51c829 100644
--- a/tests/clock.test
+++ b/tests/clock.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/cmdAH.test b/tests/cmdAH.test
index 53bbf83..cc167a0 100644
--- a/tests/cmdAH.test
+++ b/tests/cmdAH.test
@@ -11,7 +11,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2.1
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/cmdIL.test b/tests/cmdIL.test
index 57607bd..68f7892 100644
--- a/tests/cmdIL.test
+++ b/tests/cmdIL.test
@@ -9,10 +9,11 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
+
 ::tcltest::loadTestedCommands
 catch [list package require -exact Tcltest [info patchlevel]]
 
diff --git a/tests/cmdInfo.test b/tests/cmdInfo.test
index 0a587e8..e690002 100644
--- a/tests/cmdInfo.test
+++ b/tests/cmdInfo.test
@@ -13,8 +13,10 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2
-namespace import ::tcltest::*
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
+}
 
 ::tcltest::loadTestedCommands
 catch [list package require -exact Tcltest [info patchlevel]]
diff --git a/tests/cmdMZ.test b/tests/cmdMZ.test
index 43b3703..0675a5d 100644
--- a/tests/cmdMZ.test
+++ b/tests/cmdMZ.test
@@ -11,9 +11,9 @@
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-if {[catch {package require tcltest 2.1}]} {
-    puts stderr "Skipping tests in [info script]. tcltest 2.1 required."
-    return
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
 }
 
 namespace eval ::tcl::test::cmdMZ {
diff --git a/tests/compExpr-old.test b/tests/compExpr-old.test
index 237aab4..f573cfa 100644
--- a/tests/compExpr-old.test
+++ b/tests/compExpr-old.test
@@ -13,10 +13,11 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
+
 ::tcltest::loadTestedCommands
 catch [list package require -exact Tcltest [info patchlevel]]
 
diff --git a/tests/compExpr.test b/tests/compExpr.test
index 66cf1f7..e9220c1 100644
--- a/tests/compExpr.test
+++ b/tests/compExpr.test
@@ -9,7 +9,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/compile.test b/tests/compile.test
index 18e978f..b90f124 100644
--- a/tests/compile.test
+++ b/tests/compile.test
@@ -11,8 +11,11 @@
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2
-namespace import -force ::tcltest::*
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
+}
+
 
 ::tcltest::loadTestedCommands
 catch [list package require -exact Tcltest [info patchlevel]]
diff --git a/tests/concat.test b/tests/concat.test
index eeb11ca..8ff5500 100644
--- a/tests/concat.test
+++ b/tests/concat.test
@@ -12,7 +12,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/config.test b/tests/config.test
index 1767f59..b78e29d 100644
--- a/tests/config.test
+++ b/tests/config.test
@@ -13,7 +13,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/coroutine.test b/tests/coroutine.test
index c8c8176..6d79fd7 100644
--- a/tests/coroutine.test
+++ b/tests/coroutine.test
@@ -10,7 +10,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/dcall.test b/tests/dcall.test
index 41dd777..7d86135 100644
--- a/tests/dcall.test
+++ b/tests/dcall.test
@@ -11,8 +11,10 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2
-namespace import ::tcltest::*
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
+}
 
 ::tcltest::loadTestedCommands
 catch [list package require -exact Tcltest [info patchlevel]]
diff --git a/tests/dstring.test b/tests/dstring.test
index 5feb355..8a24ebe 100644
--- a/tests/dstring.test
+++ b/tests/dstring.test
@@ -12,7 +12,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/encoding.test b/tests/encoding.test
index f483160..d0ca114 100644
--- a/tests/encoding.test
+++ b/tests/encoding.test
@@ -8,13 +8,15 @@
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
+}
+
 
 namespace eval ::tcl::test::encoding {
     variable x
 
-namespace import -force ::tcltest::*
-
 catch {
     ::tcltest::loadTestedCommands
     package require -exact Tcltest [info patchlevel]
diff --git a/tests/env.test b/tests/env.test
index 0dc4a85..bad9e66 100644
--- a/tests/env.test
+++ b/tests/env.test
@@ -12,7 +12,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/error.test b/tests/error.test
index 28e4f5c..a111c80 100644
--- a/tests/error.test
+++ b/tests/error.test
@@ -12,7 +12,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/eval.test b/tests/eval.test
index 70ceac8..d473fdf 100644
--- a/tests/eval.test
+++ b/tests/eval.test
@@ -12,7 +12,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/event.test b/tests/event.test
index 70d4cff..3194547 100644
--- a/tests/event.test
+++ b/tests/event.test
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2
+package require tcltest 2.5
 namespace import -force ::tcltest::*
 
 catch {
diff --git a/tests/exec.test b/tests/exec.test
index 36aeae5..5082393 100644
--- a/tests/exec.test
+++ b/tests/exec.test
@@ -14,8 +14,10 @@
 # There is no point in running Valgrind on cases where [exec] forks but then
 # fails and the child process doesn't go through full cleanup.
 
-package require tcltest 2
-namespace import -force ::tcltest::*
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
+}
 
 loadTestedCommands
 catch [list package require -exact Tcltest [info patchlevel]]
diff --git a/tests/execute.test b/tests/execute.test
index b3466e5..6d27e55 100644
--- a/tests/execute.test
+++ b/tests/execute.test
@@ -15,7 +15,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
@@ -984,7 +984,7 @@ test execute-8.5 {Bug 2038069} -setup {
 test execute-8.6 {Compile epoch bump in global level (bug [fa6bf38d07])} -setup {
     interp create child
     child eval {
-	package require tcltest
+	package require tcltest 2.5
 	catch [list package require -exact Tcltest [info patchlevel]]
 	::tcltest::loadTestedCommands
 	if {[namespace which -command testbumpinterpepoch] eq ""} {
@@ -1017,7 +1017,7 @@ test execute-8.6 {Compile epoch bump in global level (bug [fa6bf38d07])} -setup
 test execute-8.7 {Compile epoch bump in global level (bug [fa6bf38d07]), exception case} -setup {
     interp create child
     child eval {
-	package require tcltest
+	package require tcltest 2.5
 	catch [list package require -exact Tcltest [info patchlevel]]
 	::tcltest::loadTestedCommands
 	if {[namespace which -command testbumpinterpepoch] eq ""} {
diff --git a/tests/expr-old.test b/tests/expr-old.test
index 003ee00..ad5a6bc 100644
--- a/tests/expr-old.test
+++ b/tests/expr-old.test
@@ -13,8 +13,10 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2.1
-namespace import ::tcltest::*
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
+}
 
 ::tcltest::loadTestedCommands
 catch [list package require -exact Tcltest [info patchlevel]]
diff --git a/tests/expr.test b/tests/expr.test
index 632f1c4..0b4fa2b 100644
--- a/tests/expr.test
+++ b/tests/expr.test
@@ -11,7 +11,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-   package require tcltest 2.1
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/fCmd.test b/tests/fCmd.test
index e8ed6f9..53313dc 100644
--- a/tests/fCmd.test
+++ b/tests/fCmd.test
@@ -11,7 +11,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/fileName.test b/tests/fileName.test
index 0e4cb9e..d4dfd9a 100644
--- a/tests/fileName.test
+++ b/tests/fileName.test
@@ -11,10 +11,11 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
+
 ::tcltest::loadTestedCommands
 catch [list package require -exact Tcltest [info patchlevel]]
 
diff --git a/tests/fileSystem.test b/tests/fileSystem.test
index 361542d..19066ee 100644
--- a/tests/fileSystem.test
+++ b/tests/fileSystem.test
@@ -9,9 +9,12 @@
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2
 namespace eval ::tcl::test::fileSystem {
-    namespace import ::tcltest::*
+
+    if {"::tcltest" ni [namespace children]} {
+	package require tcltest 2.5
+	namespace import -force ::tcltest::*
+    }
 
     catch {
 	file delete -force link.file
diff --git a/tests/fileSystemEncoding.test b/tests/fileSystemEncoding.test
index 0f8a2a7..6561bef 100644
--- a/tests/fileSystemEncoding.test
+++ b/tests/fileSystemEncoding.test
@@ -7,8 +7,11 @@ if {[string equal $::tcl_platform(os) "Windows NT"]} {
 }
 
 namespace eval ::tcl::test::fileSystemEncoding {
-    package require tcltest 2
-    namespace import ::tcltest::*
+
+    if {"::tcltest" ni [namespace children]} {
+	package require tcltest 2.5
+	namespace import -force ::tcltest::*
+    }
 
     variable fname1 \u767b\u9e1b\u9d72\u6a13
 
diff --git a/tests/for-old.test b/tests/for-old.test
index bf69376..d00a4ee 100644
--- a/tests/for-old.test
+++ b/tests/for-old.test
@@ -13,7 +13,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/for.test b/tests/for.test
index bc2f40e..239e4d6 100644
--- a/tests/for.test
+++ b/tests/for.test
@@ -10,7 +10,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/foreach.test b/tests/foreach.test
index 6ef608e..cdbfc85 100644
--- a/tests/foreach.test
+++ b/tests/foreach.test
@@ -11,7 +11,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/format.test b/tests/format.test
index ded8a4c..8d6fd82 100644
--- a/tests/format.test
+++ b/tests/format.test
@@ -11,7 +11,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/get.test b/tests/get.test
index e39097c..9e7728a 100644
--- a/tests/get.test
+++ b/tests/get.test
@@ -11,7 +11,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/history.test b/tests/history.test
index 9ff41f2..922d984 100644
--- a/tests/history.test
+++ b/tests/history.test
@@ -12,7 +12,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/http.test b/tests/http.test
index cd5996f..7454ab8 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -11,8 +11,10 @@
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2
-namespace import -force ::tcltest::*
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
+}
 
 if {[catch {package require http 2} version]} {
     if {[info exists http2]} {
diff --git a/tests/http11.test b/tests/http11.test
index 989b00f..7ca57f4 100644
--- a/tests/http11.test
+++ b/tests/http11.test
@@ -7,8 +7,10 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2
-namespace import -force ::tcltest::*
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
+}
 
 package require http 2.9
 
diff --git a/tests/httpPipeline.test b/tests/httpPipeline.test
index de1a7d8..4306149 100644
--- a/tests/httpPipeline.test
+++ b/tests/httpPipeline.test
@@ -8,8 +8,10 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2
-namespace import -force ::tcltest::*
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
+}
 
 package require http 2.9
 
diff --git a/tests/httpcookie.test b/tests/httpcookie.test
index b3c5412..ca54073 100644
--- a/tests/httpcookie.test
+++ b/tests/httpcookie.test
@@ -9,8 +9,10 @@
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2
-namespace import -force ::tcltest::*
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
+}
 
 ::tcltest::loadTestedCommands
 
diff --git a/tests/if-old.test b/tests/if-old.test
index db23889..e537fea 100644
--- a/tests/if-old.test
+++ b/tests/if-old.test
@@ -14,7 +14,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/if.test b/tests/if.test
index d7fce19..f5acf60 100644
--- a/tests/if.test
+++ b/tests/if.test
@@ -11,7 +11,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/incr-old.test b/tests/incr-old.test
index 77597a5..5d792e1 100644
--- a/tests/incr-old.test
+++ b/tests/incr-old.test
@@ -14,7 +14,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/incr.test b/tests/incr.test
index aa2872a..9d92f85 100644
--- a/tests/incr.test
+++ b/tests/incr.test
@@ -11,7 +11,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/indexObj.test b/tests/indexObj.test
index b70b6d9..079eb52 100644
--- a/tests/indexObj.test
+++ b/tests/indexObj.test
@@ -9,7 +9,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/info.test b/tests/info.test
index 7ac6d8c..813b418 100644
--- a/tests/info.test
+++ b/tests/info.test
@@ -16,7 +16,7 @@
 # DO NOT DELETE THIS LINE
 
 if {{::tcltest} ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 ::tcltest::loadTestedCommands
diff --git a/tests/init.test b/tests/init.test
index 91df4a1..a607ff0 100644
--- a/tests/init.test
+++ b/tests/init.test
@@ -11,7 +11,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2.3.4
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/interp.test b/tests/interp.test
index 18e6872..4453d90 100644
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -11,7 +11,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2.1
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/io.test b/tests/io.test
index 4cce125..2752408 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -14,7 +14,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
 }
 
 namespace eval ::tcl::test::io {
diff --git a/tests/ioTrans.test b/tests/ioTrans.test
index 95055f1..f185117 100644
--- a/tests/ioTrans.test
+++ b/tests/ioTrans.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
@@ -37,7 +37,7 @@ testConstraint thread [expr {0 == [catch {package require Thread 2.7-}]}]
 
 set helperscript {
     if {"::tcltest" ni [namespace children]} {
-	package require tcltest 2
+	package require tcltest 2.5
 	namespace import -force ::tcltest::*
     }
 
diff --git a/tests/iogt.test b/tests/iogt.test
index 3cac2cf..fb04b5b 100644
--- a/tests/iogt.test
+++ b/tests/iogt.test
@@ -10,9 +10,9 @@
 # Copyright (c) 2000 Andreas Kupries.
 # All rights reserved.
 
-if {[catch {package require tcltest 2.1}]} {
-    puts stderr "Skipping tests in [info script].  tcltest 2.1 required."
-    return
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
 }
 
 ::tcltest::loadTestedCommands
diff --git a/tests/join.test b/tests/join.test
index b29287b..9ea554d 100644
--- a/tests/join.test
+++ b/tests/join.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/lindex.test b/tests/lindex.test
index 41c803b..85129b4 100644
--- a/tests/lindex.test
+++ b/tests/lindex.test
@@ -13,7 +13,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2.2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/link.test b/tests/link.test
index 336634b..89e5aa2 100644
--- a/tests/link.test
+++ b/tests/link.test
@@ -12,7 +12,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/linsert.test b/tests/linsert.test
index 2728360..ddc56a9 100644
--- a/tests/linsert.test
+++ b/tests/linsert.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/list.test b/tests/list.test
index 5477806..edb572c 100644
--- a/tests/list.test
+++ b/tests/list.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/listObj.test b/tests/listObj.test
index fb6397e..ce6c978 100644
--- a/tests/listObj.test
+++ b/tests/listObj.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/llength.test b/tests/llength.test
index 469cd5f..a2770c0 100644
--- a/tests/llength.test
+++ b/tests/llength.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/lmap.test b/tests/lmap.test
index 641eac2..3b52c64 100644
--- a/tests/lmap.test
+++ b/tests/lmap.test
@@ -14,7 +14,7 @@
 # RCS: @(#) $Id: $
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/load.test b/tests/load.test
index 54faa75..9fdf1cf 100644
--- a/tests/load.test
+++ b/tests/load.test
@@ -11,7 +11,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/lpop.test b/tests/lpop.test
index 602e8e0..35f0103 100644
--- a/tests/lpop.test
+++ b/tests/lpop.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/lrange.test b/tests/lrange.test
index 8734078..a20422f 100644
--- a/tests/lrange.test
+++ b/tests/lrange.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/lrepeat.test b/tests/lrepeat.test
index 9ca5ba8..f62f35f 100644
--- a/tests/lrepeat.test
+++ b/tests/lrepeat.test
@@ -10,7 +10,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/lreplace.test b/tests/lreplace.test
index d2d5cfb..0b3f7f1 100644
--- a/tests/lreplace.test
+++ b/tests/lreplace.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/lsearch.test b/tests/lsearch.test
index 2086615..6d183ad 100644
--- a/tests/lsearch.test
+++ b/tests/lsearch.test
@@ -12,7 +12,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/lset.test b/tests/lset.test
index 3fdec90..d98a38e 100644
--- a/tests/lset.test
+++ b/tests/lset.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/lsetComp.test b/tests/lsetComp.test
index c13d23e..d313bbc 100644
--- a/tests/lsetComp.test
+++ b/tests/lsetComp.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/macOSXFCmd.test b/tests/macOSXFCmd.test
index 08cedd7..0a147f0 100644
--- a/tests/macOSXFCmd.test
+++ b/tests/macOSXFCmd.test
@@ -10,7 +10,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/macOSXLoad.test b/tests/macOSXLoad.test
index fb56d7d..ea4a910 100644
--- a/tests/macOSXLoad.test
+++ b/tests/macOSXLoad.test
@@ -11,7 +11,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 set oldTSF $::tcltest::testSingleFile
diff --git a/tests/main.test b/tests/main.test
index 0398d36..c7347b9 100644
--- a/tests/main.test
+++ b/tests/main.test
@@ -1,8 +1,8 @@
 # This file contains a collection of tests for generic/tclMain.c.
 
-if {[catch {package require tcltest 2.0.2}]} {
-    puts stderr "Skipping tests in [info script]. tcltest 2.0.2 required."
-    return
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
 }
 
 namespace eval ::tcl::test::main {
diff --git a/tests/mathop.test b/tests/mathop.test
index 703a572..f4a810f 100644
--- a/tests/mathop.test
+++ b/tests/mathop.test
@@ -11,7 +11,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2.1
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/misc.test b/tests/misc.test
index 0d93ea6..8f8516e 100644
--- a/tests/misc.test
+++ b/tests/misc.test
@@ -13,7 +13,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/msgcat.test b/tests/msgcat.test
index 4ab3622..6e95c03 100644
--- a/tests/msgcat.test
+++ b/tests/msgcat.test
@@ -12,10 +12,9 @@
 # Note that after running these tests, entries will be left behind in the
 # message catalogs for locales foo, foo_BAR, and foo_BAR_baz.
 
-package require Tcl 8.5-
-if {[catch {package require tcltest 2}]} {
-    puts stderr "Skipping tests in [info script].  tcltest 2 required."
-    return
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
 }
 if {[catch {package require msgcat 1.6}]} {
     puts stderr "Skipping tests in [info script].  No msgcat 1.6 found to test."
diff --git a/tests/namespace-old.test b/tests/namespace-old.test
index 1d6a805..f503a4d 100644
--- a/tests/namespace-old.test
+++ b/tests/namespace-old.test
@@ -15,7 +15,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2.2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/namespace.test b/tests/namespace.test
index 9c4672f..d09a853 100644
--- a/tests/namespace.test
+++ b/tests/namespace.test
@@ -12,8 +12,10 @@
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2
-namespace import -force ::tcltest::*
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
+}
 testConstraint memory [llength [info commands memory]]
 
 ::tcltest::loadTestedCommands
diff --git a/tests/notify.test b/tests/notify.test
index e34392b..7375f83 100644
--- a/tests/notify.test
+++ b/tests/notify.test
@@ -14,7 +14,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/nre.test b/tests/nre.test
index 5591862..7cf06d1 100644
--- a/tests/nre.test
+++ b/tests/nre.test
@@ -10,7 +10,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/obj.test b/tests/obj.test
index 62bcae5..8a74a05 100644
--- a/tests/obj.test
+++ b/tests/obj.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/oo.test b/tests/oo.test
index 16beaf9..0dc26f2 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -8,8 +8,8 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 package require TclOO 1.0.3
-package require tcltest 2
-if {"::tcltest" in [namespace children]} {
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/ooNext2.test b/tests/ooNext2.test
index 59925e7..0ec7cdd 100644
--- a/tests/ooNext2.test
+++ b/tests/ooNext2.test
@@ -8,8 +8,8 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 package require TclOO 1.0.3
-package require tcltest 2
-if {"::tcltest" in [namespace children]} {
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/ooUtil.test b/tests/ooUtil.test
index 4f4bea7..7fc9b9c 100644
--- a/tests/ooUtil.test
+++ b/tests/ooUtil.test
@@ -10,8 +10,8 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 package require TclOO 1.0.3
-package require tcltest 2
-if {"::tcltest" in [namespace children]} {
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/opt.test b/tests/opt.test
index 915a7c9..0af4488 100644
--- a/tests/opt.test
+++ b/tests/opt.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/package.test b/tests/package.test
index e12dd30..1223d82 100644
--- a/tests/package.test
+++ b/tests/package.test
@@ -13,7 +13,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2.3.3
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/parse.test b/tests/parse.test
index 9980015..94c7f74 100644
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -8,9 +8,9 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-if {[catch {package require tcltest 2.0.2}]} {
-    puts stderr "Skipping tests in [info script]. tcltest 2.0.2 required."
-    return
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
 }
 
 namespace eval ::tcl::test::parse {
diff --git a/tests/parseExpr.test b/tests/parseExpr.test
index 47dbec5..8b5e429 100644
--- a/tests/parseExpr.test
+++ b/tests/parseExpr.test
@@ -8,8 +8,10 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2
-namespace import ::tcltest::*
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
+}
 
 ::tcltest::loadTestedCommands
 catch [list package require -exact Tcltest [info patchlevel]]
diff --git a/tests/parseOld.test b/tests/parseOld.test
index 504d063..134a3c2 100644
--- a/tests/parseOld.test
+++ b/tests/parseOld.test
@@ -13,8 +13,10 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2
-namespace import ::tcltest::*
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
+}
 
 ::tcltest::loadTestedCommands
 catch [list package require -exact Tcltest [info patchlevel]]
diff --git a/tests/pid.test b/tests/pid.test
index 8887b66..47f753b 100644
--- a/tests/pid.test
+++ b/tests/pid.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/pkgMkIndex.test b/tests/pkgMkIndex.test
index 37afafa..8121377 100644
--- a/tests/pkgMkIndex.test
+++ b/tests/pkgMkIndex.test
@@ -8,8 +8,10 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
-package require tcltest 2
-namespace import ::tcltest::*
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
+}
 
 set fullPkgPath [makeDirectory pkg]
 
diff --git a/tests/platform.test b/tests/platform.test
index 53d534e..fff16fd 100644
--- a/tests/platform.test
+++ b/tests/platform.test
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2
+package require tcltest 2.5
 
 namespace eval ::tcl::test::platform {
     namespace import ::tcltest::testConstraint
diff --git a/tests/proc-old.test b/tests/proc-old.test
index 96b24b8..79ee1fa 100644
--- a/tests/proc-old.test
+++ b/tests/proc-old.test
@@ -15,7 +15,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/proc.test b/tests/proc.test
index 585efa5..7039dbb 100644
--- a/tests/proc.test
+++ b/tests/proc.test
@@ -14,7 +14,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/process.test b/tests/process.test
index ef23cfb..d7f47b2 100644
--- a/tests/process.test
+++ b/tests/process.test
@@ -9,7 +9,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/pwd.test b/tests/pwd.test
index d48c2ad..3486e70 100644
--- a/tests/pwd.test
+++ b/tests/pwd.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/reg.test b/tests/reg.test
index 2ee1048..4b65503 100644
--- a/tests/reg.test
+++ b/tests/reg.test
@@ -10,7 +10,8 @@
 # Copyright (c) 1998, 1999 Henry Spencer.  All rights reserved.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
+    namespace import -force ::tcltest::*
 }
 
 ::tcltest::loadTestedCommands
diff --git a/tests/regexp.test b/tests/regexp.test
index ee92a35..a2e6dbb 100644
--- a/tests/regexp.test
+++ b/tests/regexp.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/regexpComp.test b/tests/regexpComp.test
index 4d531bd..53a68c5 100644
--- a/tests/regexpComp.test
+++ b/tests/regexpComp.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/registry.test b/tests/registry.test
index c5e6e5a..53e48fe 100644
--- a/tests/registry.test
+++ b/tests/registry.test
@@ -11,7 +11,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/rename.test b/tests/rename.test
index 398d0f2..ddda909 100644
--- a/tests/rename.test
+++ b/tests/rename.test
@@ -12,7 +12,7 @@
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 if {"::tcltest" ni [namespace children]} {
-    package require tcltest 2
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/resolver.test b/tests/resolver.test
index db524a0..9916529 100644
--- a/tests/resolver.test
+++ b/tests/resolver.test
@@ -10,8 +10,8 @@
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
-package require tcltest 2
-if {"::tcltest" in [namespace children]} {
+if {"::tcltest" ni [namespace children]} {
+    package require tcltest 2.5
     namespace import -force ::tcltest::*
 }
 
diff --git a/tests/result.test b/tests/result.test
index 859e546..f1f5fb7 100644
--- a/tests/result.test
+++ b/tests/result.test