diff --git a/clang/test/Driver/check-time-trace-sections.cpp b/clang/test/Driver/check-time-trace-sections.cpp
deleted file mode 100644
index 2dbe2037550a5..0000000000000
--- a/clang/test/Driver/check-time-trace-sections.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-// RUN: %clangxx -S -ftime-trace -ftime-trace-granularity=0 -o %T/check-time-trace-sections %s
-// RUN: cat %T/check-time-trace-sections.json | %python %S/check-time-trace-sections.py
-
-template <typename T>
-void foo(T) {}
-void bar() { foo(0); }
diff --git a/clang/test/Driver/ftime-trace-sections.cpp b/clang/test/Driver/ftime-trace-sections.cpp
new file mode 100644
index 0000000000000..0c16052bc0c3a
--- /dev/null
+++ b/clang/test/Driver/ftime-trace-sections.cpp
@@ -0,0 +1,7 @@
+// RUN: rm -rf %t && mkdir %t && cd %t
+// RUN: %clangxx -S -ftime-trace -ftime-trace-granularity=0 -o out %s
+// RUN: %python %S/ftime-trace-sections.py < out.json
+
+template <typename T>
+void foo(T) {}
+void bar() { foo(0); }
diff --git a/clang/test/Driver/check-time-trace-sections.py b/clang/test/Driver/ftime-trace-sections.py
similarity index 100%
rename from clang/test/Driver/check-time-trace-sections.py
rename to clang/test/Driver/ftime-trace-sections.py
diff --git a/clang/test/Driver/check-time-trace.cpp b/clang/test/Driver/ftime-trace.cpp
similarity index 62%
rename from clang/test/Driver/check-time-trace.cpp
rename to clang/test/Driver/ftime-trace.cpp
index 32940500db1bc..42a969059101f 100644
--- a/clang/test/Driver/check-time-trace.cpp
+++ b/clang/test/Driver/ftime-trace.cpp
@@ -1,19 +1,19 @@
-// RUN: %clangxx -S -ftime-trace -ftime-trace-granularity=0 -o %T/check-time-trace %s
-// RUN: cat %T/check-time-trace.json \
+// RUN: rm -rf %t && mkdir -p %t && cd %t
+// RUN: %clangxx -S -ftime-trace -ftime-trace-granularity=0 -o out %s
+// RUN: cat out.json \
 // RUN:   | %python -c 'import json, sys; json.dump(json.loads(sys.stdin.read()), sys.stdout, sort_keys=True, indent=2)' \
 // RUN:   | FileCheck %s
-// RUN: %clangxx -S -ftime-trace=%T/new-name.json -ftime-trace-granularity=0 -o %T/check-time-trace %s
-// RUN: cat %T/new-name.json \
+// RUN: %clangxx -S -ftime-trace=new-name.json -ftime-trace-granularity=0 -o out %s
+// RUN: cat new-name.json \
 // RUN:   | %python -c 'import json, sys; json.dump(json.loads(sys.stdin.read()), sys.stdout, sort_keys=True, indent=2)' \
 // RUN:   | FileCheck %s
-// RUN: rm -rf %T/output1 && mkdir %T/output1
-// RUN: %clangxx -S -ftime-trace=%T/output1 -ftime-trace-granularity=0 -o %T/check-time-trace %s
-// RUN: cat %T/output1/check-time-trace.json \
+// RUN: mkdir dir1 dir2
+// RUN: %clangxx -S -ftime-trace=dir1 -ftime-trace-granularity=0 -o out %s
+// RUN: cat dir1/out.json \
 // RUN:   | %python -c 'import json, sys; json.dump(json.loads(sys.stdin.read()), sys.stdout, sort_keys=True, indent=2)' \
 // RUN:   | FileCheck %s
-// RUN: rm -rf %T/output2 && mkdir %T/output2
-// RUN: %clangxx -S -ftime-trace=%T/output2/ -ftime-trace-granularity=0 -o %T/check-time-trace %s
-// RUN: cat %T/output2/check-time-trace.json \
+// RUN: %clangxx -S -ftime-trace=dir2/ -ftime-trace-granularity=0 -o out %s
+// RUN: cat dir2/out.json \
 // RUN:   | %python -c 'import json, sys; json.dump(json.loads(sys.stdin.read()), sys.stdout, sort_keys=True, indent=2)' \
 // RUN:   | FileCheck %s