Index: tests/fileSystem.test
==================================================================
--- tests/fileSystem.test
+++ tests/fileSystem.test
@@ -1022,12 +1022,15 @@
 
 # The filesystem-11.* tests are currently disabled on MacOS.
 # See Bug [e6ca0b1b67]
 test filesystem-11.1 {
     Bug 10890417 - case of tail is correct after normalization
-} -constraints {notWsl notOSX} -body {
-    tcltest::makeFile "" mIxEdCaSe.TxT
+} -constraints {notWsl notOSX} -setup {
+    makeFile "" mIxEdCaSe.TxT
+} -cleanup {
+    removeFile mIxEdCaSe.TxT
+} -body {
     lmap file1 [glob [tcltest::temporaryDirectory]/mixedcase.txt \
                     [tcltest::temporaryDirectory]/MIXEDCASE.TXT \
                     [tcltest::temporaryDirectory]/mIxEdCaSe.TxT \
                    ] {
                         file normalize $file1
@@ -1038,12 +1041,15 @@
                  :
                  [list [tcltest::temporaryDirectory]/mIxEdCaSe.TxT]}]
 
 test filesystem-11.2 {
     Bug 10890417 - case of tail is correct after normalization (-directory)
-} -constraints {notWsl notOSX} -body {
-    tcltest::makeFile "" mIxEdCaSe.TxT
+} -constraints {notWsl notOSX} -setup {
+    makeFile "" mIxEdCaSe.TxT
+} -cleanup {
+    removeFile mIxEdCaSe.TxT
+} -body {
     lmap file1 [glob -directory [tcltest::temporaryDirectory] \
                     mixedcase.txt MIXEDCASE.TXT mIxEdCaSe.TxT ] {
                         file normalize $file1
                     }
 } -result [expr {
@@ -1053,13 +1059,17 @@
                  [list [file join [tcltest::temporaryDirectory] mIxEdCaSe.TxT]]}]
 
 test filesystem-11.3 {
     Bug 10890417 - case of dir is correct after normalization
 } -constraints {notWsl notOSX} -setup {
-    set dir [tcltest::makeDirectory MiXeDcAsE]
+    set dir [makeDirectory MiXeDcAsE]
     set parent [file dirname $dir]
-    tcltest::makeFile "" foo.txt $dir
+    makeFile "" foo.txt $dir
+} -cleanup {
+    removeFile foo.txt $dir
+    removeDirectory MiXeDcAsE
+    unset -nocomplain parent dir
 } -body {
     lmap file1 [glob $parent/mixedcase/foo.txt \
                     $parent/MIXEDCASE/foo.txt \
                     $parent/MiXeDcAsE/foo.txt] {
                         file tail [file dirname [file normalize $file1]]
@@ -1071,13 +1081,17 @@
                  [list MiXeDcAsE]}]
 
 test filesystem-11.4 {
     Bug 10890417 - case of dir is correct after normalization (-directory)
 } -constraints {notWsl notOSX} -setup {
-    set dir [tcltest::makeDirectory MiXeDcAsE]
+    set dir [makeDirectory MiXeDcAsE]
     set parent [file dirname $dir]
-    tcltest::makeFile "" foo.txt $dir
+    makeFile "" foo.txt $dir
+} -cleanup {
+    removeFile foo.txt $dir
+    removeDirectory MiXeDcAsE
+    unset -nocomplain parent dir
 } -body {
     lmap file1 [concat [glob -dir $parent/mixedcase foo.txt] \
                     [glob -dir $parent/MIXEDCASE foo.txt] \
                     [glob -dir $parent/MiXeDcAsE foo.txt]] {
                         file tail [file dirname [file normalize $file1]]

Index: tests/utf.test
==================================================================
--- tests/utf.test
+++ tests/utf.test
@@ -1126,11 +1126,11 @@
 test utf-24.6 {unicode space char in regc_locale.c} tip413 {
     # this returns 1 with Unicode 7/TIP 413 compliance
     list [regexp {^[[:space:]]+$} \x85\u1680\u180E\u200B\u202F\u2060] [regexp {^\s+$} \x85\u1680\u180E\u200B\u202F\u2060]
 } {1 1}
 
-test utf-25.1 {tupper/tolower/totitle out of range values} testuniclass {
+test utf-25.1.0 {tupper/tolower/totitle out of range values} testuniclass {
     list [testuniclass 0x11FFFF] \
 	[testuniclass 0x1FFFFF] \
 	[testuniclass 0x200041] \
 	[testuniclass 0x200061] \
 	[testuniclass 0x20005F] \