diff --git a/lib/Transforms/Scalar/IndVarSimplify.cpp b/lib/Transforms/Scalar/IndVarSimplify.cpp
index b5500dec6e7..e240c42e36c 100644
--- a/lib/Transforms/Scalar/IndVarSimplify.cpp
+++ b/lib/Transforms/Scalar/IndVarSimplify.cpp
@@ -60,7 +60,7 @@ STATISTIC(NumElimIV      , "Number of congruent IVs eliminated");
 
 namespace llvm {
   cl::opt<bool> EnableIVRewrite(
-    "enable-iv-rewrite", cl::Hidden, cl::init(true),
+    "enable-iv-rewrite", cl::Hidden,
     cl::desc("Enable canonical induction variable rewriting"));
 
   // Trip count verification can be enabled by default under NDEBUG if we
diff --git a/test/Transforms/IndVarSimplify/floating-point-iv.ll b/test/Transforms/IndVarSimplify/floating-point-iv.ll
index e334f069b81..266eebd5bb6 100644
--- a/test/Transforms/IndVarSimplify/floating-point-iv.ll
+++ b/test/Transforms/IndVarSimplify/floating-point-iv.ll
@@ -87,6 +87,6 @@ exit:
   ret void
 
 ; CHECK: @test5
-; CHECK: icmp eq i32 {{.*}}, 10
+; CHECK: icmp slt i32 {{.*}}, 0
 ; CHECK-NEXT: br i1
 }
diff --git a/test/Transforms/LoopUnroll/scevunroll.ll b/test/Transforms/LoopUnroll/scevunroll.ll
index 9971f310ec4..99b3a7d8619 100644
--- a/test/Transforms/LoopUnroll/scevunroll.ll
+++ b/test/Transforms/LoopUnroll/scevunroll.ll
@@ -67,7 +67,7 @@ exit2:
 ; SCEV properly unrolls multi-exit loops.
 ;
 ; CHECK: @multiExit
-; CHECK: getelementptr i32* %base, i64 10
+; CHECK: getelementptr i32* %base, i32 10
 ; CHECK-NEXT: load i32*
 ; CHECK: br i1 false, label %l2.10, label %exit1
 ; CHECK: l2.10: