diff --git a/unittests/Support/CMakeLists.txt b/unittests/Support/CMakeLists.txt
index b66c5db2c3e..fedfb3d2254 100644
--- a/unittests/Support/CMakeLists.txt
+++ b/unittests/Support/CMakeLists.txt
@@ -28,7 +28,7 @@ add_llvm_unittest(SupportTests
   ProgramTest.cpp
   RegexTest.cpp
   SwapByteOrderTest.cpp
-  TimeValue.cpp
+  TimeValueTest.cpp
   ValueHandleTest.cpp
   YAMLIOTest.cpp
   YAMLParserTest.cpp
diff --git a/unittests/Support/TimeValue.cpp b/unittests/Support/TimeValueTest.cpp
similarity index 82%
rename from unittests/Support/TimeValue.cpp
rename to unittests/Support/TimeValueTest.cpp
index 27883ae3356..0fd56750151 100644
--- a/unittests/Support/TimeValue.cpp
+++ b/unittests/Support/TimeValueTest.cpp
@@ -1,4 +1,4 @@
-//===- llvm/unittest/Support/TimeValue.cpp - Time Value tests -------------===//
+//===- llvm/unittest/Support/TimeValueTest.cpp - Time Value tests ---------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,7 +14,7 @@
 using namespace llvm;
 namespace {
 
-TEST(Support, TimeValue) {
+TEST(TimeValue, time_t) {
   sys::TimeValue now = sys::TimeValue::now();
   time_t now_t = time(NULL);
   EXPECT_TRUE(abs(static_cast<long>(now_t - now.toEpochTime())) < 2);