diff --git a/lib/IR/GCOV.cpp b/lib/IR/GCOV.cpp
index 14eb71f0300..d377858498c 100644
--- a/lib/IR/GCOV.cpp
+++ b/lib/IR/GCOV.cpp
@@ -367,7 +367,7 @@ void FileInfo::print(StringRef GCNOFile, StringRef GCDAFile) const {
     }
     StringRef AllLines = Buff->getBuffer();
 
-    std::string CovFilename = Filename.str() + ".llcov";
+    std::string CovFilename = Filename.str() + ".gcov";
     std::string ErrorInfo;
     raw_fd_ostream OS(CovFilename.c_str(), ErrorInfo);
     if (!ErrorInfo.empty())
diff --git a/test/tools/llvm-cov/Inputs/test.cpp.gcov b/test/tools/llvm-cov/Inputs/test.cpp.orig_gcov
similarity index 100%
rename from test/tools/llvm-cov/Inputs/test.cpp.gcov
rename to test/tools/llvm-cov/Inputs/test.cpp.orig_gcov
diff --git a/test/tools/llvm-cov/llvm-cov.test b/test/tools/llvm-cov/llvm-cov.test
index b08b514a9f2..48fee458712 100644
--- a/test/tools/llvm-cov/llvm-cov.test
+++ b/test/tools/llvm-cov/llvm-cov.test
@@ -6,8 +6,7 @@ RUN: cd %t
 RUN: cp %p/Inputs/test* .
 
 RUN: llvm-cov -gcno=test.gcno -gcda=test.gcda
-RUN: diff -aub test.cpp.gcov test.cpp.llcov
-RUN: rm test.cpp.llcov
+RUN: diff -aub test.cpp.orig_gcov test.cpp.gcov
 
 RUN: not llvm-cov -gcno=test_read_fail.gcno -gcda=test.gcda