diff --git a/unittests/VMCore/pr11677.cpp b/unittests/Bitcode/BitReaderTest.cpp
similarity index 92%
rename from unittests/VMCore/pr11677.cpp
rename to unittests/Bitcode/BitReaderTest.cpp
index 362eec77630..91e6c151558 100644
--- a/unittests/VMCore/pr11677.cpp
+++ b/unittests/Bitcode/BitReaderTest.cpp
@@ -1,4 +1,4 @@
-//===- llvm/unittest/VMCore/pr11677.cpp - Test for blockaddr --------------===//
+//===- llvm/unittest/Bitcode/BitReaderTest.cpp - Tests for BitReader ------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -49,7 +49,7 @@ static void writeModuleToBuffer(std::vector<unsigned char> &Buffer) {
   WriteBitcodeToStream(Mod, Stream);
 }
 
-TEST(PR11677, BlockAddr) {
+TEST(BitReaderTest, MaterializeFunctionsForBlockAddr) { // PR11677
   std::vector<unsigned char> Mem;
   writeModuleToBuffer(Mem);
   StringRef Data((const char*)&Mem[0], Mem.size());
@@ -60,5 +60,6 @@ TEST(PR11677, BlockAddr) {
   passes.add(createVerifierPass());
   passes.run(*m);
 }
+
 }
 }
diff --git a/unittests/Bitcode/Makefile b/unittests/Bitcode/Makefile
new file mode 100644
index 00000000000..aa437e7e2cc
--- /dev/null
+++ b/unittests/Bitcode/Makefile
@@ -0,0 +1,15 @@
+##===- unittests/Bitcode/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 = Bitcode
+LINK_COMPONENTS := core support bitreader bitwriter
+
+include $(LEVEL)/Makefile.config
+include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index 3cd7f2f051d..6724f2df83f 100644
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -112,7 +112,6 @@ set(VMCoreSources
   VMCore/PassManagerTest.cpp
   VMCore/ValueMapTest.cpp
   VMCore/VerifierTest.cpp
-  VMCore/pr11677.cpp
   )
 
 # MSVC9 and 8 cannot compile ValueMapTest.cpp due to their bug.
@@ -123,6 +122,10 @@ endif()
 
 add_llvm_unittest(VMCore ${VMCoreSources})
 
+add_llvm_unittest(Bitcode
+  Bitcode/BitReaderTest.cpp
+  )
+
 set(LLVM_LINK_COMPONENTS
   Support
   Core
diff --git a/unittests/Makefile b/unittests/Makefile
index 0401cd1c673..27afccf02e3 100644
--- a/unittests/Makefile
+++ b/unittests/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL = ..
 
-PARALLEL_DIRS = ADT ExecutionEngine Support Transforms VMCore Analysis
+PARALLEL_DIRS = ADT ExecutionEngine Support Transforms VMCore Analysis Bitcode
 
 include $(LEVEL)/Makefile.common
 
diff --git a/unittests/VMCore/Makefile b/unittests/VMCore/Makefile
index c6babe742cd..1b2b69c6d60 100644
--- a/unittests/VMCore/Makefile
+++ b/unittests/VMCore/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL = ../..
 TESTNAME = VMCore
-LINK_COMPONENTS := core support bitreader bitwriter target ipa
+LINK_COMPONENTS := core support target ipa
 
 include $(LEVEL)/Makefile.config
 include $(LLVM_SRC_ROOT)/unittests/Makefile.unittest