diff --git a/unittests/Makefile b/unittests/Makefile
index b743838b868..6f4dae1055c 100644
--- a/unittests/Makefile
+++ b/unittests/Makefile
@@ -9,13 +9,6 @@
 
 LEVEL = ..
 
-include $(LEVEL)/Makefile.config
-
-LIBRARYNAME = UnitTestMain
-BUILD_ARCHIVE = 1
-CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include
-CPP.Flags += -Wno-variadic-macros
-
 PARALLEL_DIRS = ADT ExecutionEngine Support VMCore
 
 include $(LEVEL)/Makefile.common
diff --git a/utils/unittest/Makefile b/utils/unittest/Makefile
index 2f3e601b41b..6a09341832b 100644
--- a/utils/unittest/Makefile
+++ b/utils/unittest/Makefile
@@ -8,6 +8,6 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../..
-PARALLEL_DIRS = googletest
+PARALLEL_DIRS = googletest UnitTestMain
 
 include $(LEVEL)/Makefile.common
diff --git a/utils/unittest/UnitTestMain/Makefile b/utils/unittest/UnitTestMain/Makefile
new file mode 100644
index 00000000000..07a74e3c0db
--- /dev/null
+++ b/utils/unittest/UnitTestMain/Makefile
@@ -0,0 +1,19 @@
+##===- utils/unittest/UnitTestMain/Makefile ----------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+
+LEVEL = ../../..
+
+include $(LEVEL)/Makefile.config
+
+LIBRARYNAME = UnitTestMain
+BUILD_ARCHIVE = 1
+CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include
+CPP.Flags += -Wno-variadic-macros
+
+include $(LEVEL)/Makefile.common
diff --git a/unittests/TestMain.cpp b/utils/unittest/UnitTestMain/TestMain.cpp
similarity index 82%
rename from unittests/TestMain.cpp
rename to utils/unittest/UnitTestMain/TestMain.cpp
index 095076b23ec..d97dca872ad 100644
--- a/unittests/TestMain.cpp
+++ b/utils/unittest/UnitTestMain/TestMain.cpp
@@ -1,4 +1,4 @@
-//===--- unittests/TestMain.cpp - unittest driver -------------------------===//
+//===--- utils/unittest/UnitTestMain/TestMain.cpp - unittest driver -------===//
 //
 //                     The LLVM Compiler Infrastructure
 //