diff --git a/test/loading.jl b/test/loading.jl
index c53d15532a212..01865b0379b65 100644
--- a/test/loading.jl
+++ b/test/loading.jl
@@ -15,25 +15,27 @@ thefname = "the fname!//\\&\1*"
 @test @__DIR__() == dirname(@__FILE__)
 
 # Issue #5789 and PR #13542:
-cd(mktempdir()) do
-    let true_filename = "cAsEtEsT.jl", lowered_filename="casetest.jl"
-        touch(true_filename)
-        @test Base.isfile_casesensitive(true_filename)
-        @test !Base.isfile_casesensitive(lowered_filename)
-
-        # check that case-sensitivity only applies to basename of a path:
-        if isfile(lowered_filename) # case-insensitive filesystem
-            mkdir("cAsEtEsT")
-            touch(joinpath("cAsEtEsT", true_filename))
-            @test Base.isfile_casesensitive(joinpath("casetest", true_filename))
-            @test !Base.isfile_casesensitive(joinpath("casetest", lowered_filename))
+mktempdir() do dir
+    cd(dir) do
+        let true_filename = "cAsEtEsT.jl", lowered_filename="casetest.jl"
+            touch(true_filename)
+            @test Base.isfile_casesensitive(true_filename)
+            @test !Base.isfile_casesensitive(lowered_filename)
+
+            # check that case-sensitivity only applies to basename of a path:
+            if isfile(lowered_filename) # case-insensitive filesystem
+                mkdir("cAsEtEsT")
+                touch(joinpath("cAsEtEsT", true_filename))
+                @test Base.isfile_casesensitive(joinpath("casetest", true_filename))
+                @test !Base.isfile_casesensitive(joinpath("casetest", lowered_filename))
+            end
         end
-    end
 
-    # Test Unicode normalization; pertinent for OS X
-    let nfc_name = "\U00F4.jl"
-        touch(nfc_name)
-        @test Base.isfile_casesensitive(nfc_name)
+        # Test Unicode normalization; pertinent for OS X
+        let nfc_name = "\U00F4.jl"
+            touch(nfc_name)
+            @test Base.isfile_casesensitive(nfc_name)
+        end
     end
 end