diff --git a/clang-tools-extra/test/remove-cstr-calls/basic.cpp b/clang-tools-extra/test/remove-cstr-calls/basic.cpp
index d15746a0046c..4aabf1cece0c 100644
--- a/clang-tools-extra/test/remove-cstr-calls/basic.cpp
+++ b/clang-tools-extra/test/remove-cstr-calls/basic.cpp
@@ -1,12 +1,7 @@
-// RUN: rm -rf %t
-// RUN: mkdir %t
-// RUN: echo "[{\"directory\":\".\",\"command\":\"clang++ -c %t/test.cpp\",\"file\":\"%t/test.cpp\"}]" | sed -e 's/\\/\//g' > %t/compile_commands.json
-// RUN: cp "%s" "%t/test.cpp"
-// RUN: remove-cstr-calls "%t" "%t/test.cpp"
-// RUN: cat "%t/test.cpp" | FileCheck %s
+// RUN: grep -Ev "// *[A-Z-]+:" %s > %t.cpp
+// RUN: remove-cstr-calls . %t.cpp --
+// RUN: FileCheck -input-file=%t.cpp %s
 // REQUIRES: shell
-// FIXME: implement a mode for refactoring tools that takes input from stdin
-// and writes output to stdout for easier testing of tools. 
 
 namespace std {
 template<typename T> class allocator {};