diff --git a/lib/VMCore/Metadata.cpp b/lib/VMCore/Metadata.cpp
index cb1dd6553a9..48db0b4f0b3 100644
--- a/lib/VMCore/Metadata.cpp
+++ b/lib/VMCore/Metadata.cpp
@@ -35,7 +35,7 @@ void MDNode::Profile(FoldingSetNodeID &ID) const {
 //
 NamedMDNode::NamedMDNode(const Twine &N, MetadataBase*const* MDs, 
                          unsigned NumMDs, Module *ParentModule)
-  : MetadataBase(Type::MetadataTy, Value::NamedMDNodeVal) {
+  : MetadataBase(Type::MetadataTy, Value::NamedMDNodeVal), Parent(0) {
   setName(N);
   for (unsigned i = 0; i != NumMDs; ++i)
     Node.push_back(WeakMetadataVH(MDs[i]));
diff --git a/unittests/VMCore/MetadataTest.cpp b/unittests/VMCore/MetadataTest.cpp
index bdb38ef92cc..22b909969d7 100644
--- a/unittests/VMCore/MetadataTest.cpp
+++ b/unittests/VMCore/MetadataTest.cpp
@@ -119,8 +119,6 @@ TEST(MDNodeTest, Delete) {
   EXPECT_STREQ("!0 = metadata !{null}\n", oss.str().c_str());
 }
 
-  // FIXME: Disabled, this crashes on linux.
-#if 0
 TEST(NamedMDNodeTest, Search) {
   Constant *C = ConstantInt::get(Type::Int32Ty, 1);
   Constant *C2 = ConstantInt::get(Type::Int32Ty, 2);
@@ -141,5 +139,4 @@ TEST(NamedMDNodeTest, Search) {
                "!1 = metadata !{i32 2}\n",
                oss.str().c_str());
 }
-#endif
 }