diff --git a/lib/Analysis/LazyValueInfo.cpp b/lib/Analysis/LazyValueInfo.cpp
index b4f23fd96bd..c17b7274594 100644
--- a/lib/Analysis/LazyValueInfo.cpp
+++ b/lib/Analysis/LazyValueInfo.cpp
@@ -12,12 +12,14 @@
 //
 //===----------------------------------------------------------------------===//
 
+#define DEBUG_TYPE "lazy-value-info"
 #include "llvm/Analysis/LazyValueInfo.h"
 #include "llvm/Constants.h"
 #include "llvm/Instructions.h"
 #include "llvm/Analysis/ConstantFolding.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Support/CFG.h"
+#include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/PointerIntPair.h"
@@ -257,11 +259,11 @@ Constant *LazyValueInfo::getConstant(Value *V, BasicBlock *BB) {
   
   DenseMap<BasicBlock*, LVILatticeVal> BlockValues;
   
-  errs() << "Getting value " << *V << " at end of block '"
-         << BB->getName() << "'\n";
+  DEBUG(errs() << "Getting value " << *V << " at end of block '"
+               << BB->getName() << "'\n");
   LVILatticeVal Result = GetValueInBlock(V, BB, BlockValues);
   
-  errs() << "  Result = " << Result << "\n";
+  DEBUG(errs() << "  Result = " << Result << "\n");
 
   if (Result.isConstant())
     return Result.getConstant();
diff --git a/test/Transforms/JumpThreading/basic.ll b/test/Transforms/JumpThreading/basic.ll
index 1e948ed8825..514c865f9c9 100644
--- a/test/Transforms/JumpThreading/basic.ll
+++ b/test/Transforms/JumpThreading/basic.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -jump-threading -S | FileCheck %s
+; RUN: opt %s -jump-threading -S -enable-jump-threading-lvi | FileCheck %s
 
 declare i32 @f1()
 declare i32 @f2()