diff --git a/llvm/test/Object/archive-delete.test b/llvm/test/Object/archive-delete.test
index c8530beafce4..6409f7a89963 100644
--- a/llvm/test/Object/archive-delete.test
+++ b/llvm/test/Object/archive-delete.test
@@ -1,6 +1,6 @@
 Test the 'd' operation in llvm-ar
 
-RUN: cd %T
+RUN: rm -rf %t && mkdir -p %t && cd %t
 
 RUN: rm -f %t.a
 RUN: cp %p/Inputs/GNU.a %t.a
diff --git a/llvm/test/Object/archive-extract.test b/llvm/test/Object/archive-extract.test
index 664529d6c807..c5a57509d5e8 100644
--- a/llvm/test/Object/archive-extract.test
+++ b/llvm/test/Object/archive-extract.test
@@ -1,7 +1,7 @@
 ; This test just makes sure that llvm-ar can extract bytecode members
 ; from various style archives.
 
-; RUN: cd %T
+; RUN: rm -rf %t && mkdir -p %t && cd %t
 
 ; RUN: rm -f very_long_bytecode_file_name.bc
 ; RUN: llvm-ar p %p/Inputs/GNU.a very_long_bytecode_file_name.bc | \
diff --git a/llvm/test/Object/archive-move.test b/llvm/test/Object/archive-move.test
index adc114994d28..759923ad9c13 100644
--- a/llvm/test/Object/archive-move.test
+++ b/llvm/test/Object/archive-move.test
@@ -1,6 +1,6 @@
 Test the 'm' operation in llvm-ar
 
-RUN: cd %T
+RUN: rm -rf %t && mkdir -p %t && cd %t
 
 RUN: rm -f %t.a
 RUN: cp %p/Inputs/GNU.a %t.a
diff --git a/llvm/test/Object/archive-thin-paths.test b/llvm/test/Object/archive-thin-paths.test
index 21788b47acc1..8dbf3be0e180 100644
--- a/llvm/test/Object/archive-thin-paths.test
+++ b/llvm/test/Object/archive-thin-paths.test
@@ -1,6 +1,6 @@
 REQUIRES: system-windows
 
-RUN: cd %T
+RUN: rm -rf %t && mkdir -p %t && cd %t
 RUN: mkdir -p archive-thin-paths.dir
 RUN: echo foo > archive-thin-paths.dir/foo.o
 
diff --git a/llvm/test/Object/archive-update.test b/llvm/test/Object/archive-update.test
index fd1ea4113c39..669b116ce4b9 100644
--- a/llvm/test/Object/archive-update.test
+++ b/llvm/test/Object/archive-update.test
@@ -1,6 +1,6 @@
 Test the 'u' option of llvm-ar
 
-RUN: cd %T
+RUN: rm -rf %t && mkdir -p %t && cd %t
 RUN: rm -f %t.a
 
 Create a file named evenlen that is newer than the evenlen on the source dir.