diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index 8551eb8..c64ab3c 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -120,18 +120,11 @@
   Support/EndianTest.cpp
   Support/LeakDetectorTest.cpp
   Support/MathExtrasTest.cpp
+  Support/Path.cpp
   Support/raw_ostream_test.cpp
   Support/RegexTest.cpp
   Support/SwapByteOrderTest.cpp
+  Support/TimeValue.cpp
   Support/TypeBuilderTest.cpp
   Support/ValueHandleTest.cpp
   )
-
-set(LLVM_LINK_COMPONENTS
-  Support
-  )
-
-add_llvm_unittest(System
-  System/Path.cpp
-  System/TimeValue.cpp
-  )
diff --git a/unittests/System/Path.cpp b/unittests/Support/Path.cpp
similarity index 96%
rename from unittests/System/Path.cpp
rename to unittests/Support/Path.cpp
index daeb017..8be45de 100644
--- a/unittests/System/Path.cpp
+++ b/unittests/Support/Path.cpp
@@ -1,4 +1,4 @@
-//===- llvm/unittest/System/Path.cpp - Path tests -------------------------===//
+//===- llvm/unittest/Support/Path.cpp - Path tests ------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -15,7 +15,7 @@
 
 namespace {
 
-TEST(System, Path) {
+TEST(Support, Path) {
   SmallVector<StringRef, 40> paths;
   paths.push_back("");
   paths.push_back(".");
diff --git a/unittests/System/TimeValue.cpp b/unittests/Support/TimeValue.cpp
similarity index 85%
rename from unittests/System/TimeValue.cpp
rename to unittests/Support/TimeValue.cpp
index 7fd7c9256..27883ae 100644
--- a/unittests/System/TimeValue.cpp
+++ b/unittests/Support/TimeValue.cpp
@@ -1,4 +1,4 @@
-//===- llvm/unittest/System/TimeValue.cpp - Time Vlaue tests --------------===//
+//===- llvm/unittest/Support/TimeValue.cpp - Time Value tests -------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,7 +14,7 @@
 using namespace llvm;
 namespace {
 
-TEST(System, TimeValue) {
+TEST(Support, TimeValue) {
   sys::TimeValue now = sys::TimeValue::now();
   time_t now_t = time(NULL);
   EXPECT_TRUE(abs(static_cast<long>(now_t - now.toEpochTime())) < 2);
diff --git a/unittests/System/Makefile b/unittests/System/Makefile
deleted file mode 100644
index 096a761..0000000
--- a/unittests/System/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-##===- unittests/System/Makefile ---------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-
-LEVEL = ../..
-TESTNAME = System
-LINK_COMPONENTS := support
-
-include $(LEVEL)/Makefile.config
-include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest