diff --git a/llvm/test/Object/archive-delete.test b/llvm/test/Object/archive-delete.test
index 6bf8b51612d1..c8530beafce4 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 `dirname %t`
+RUN: 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 33e064a1ef69..664529d6c807 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 `dirname %t`
+; RUN: 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 d1d4f3db4d63..adc114994d28 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 `dirname %t`
+RUN: 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 f5a6d96622a8..21788b47acc1 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 `dirname %t`
+RUN: 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 6fa6662e488a..fd1ea4113c39 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 `dirname %t`
+RUN: cd %T
 RUN: rm -f %t.a
 
 Create a file named evenlen that is newer than the evenlen on the source dir.