diff --git a/test/Transforms/IPConstantProp/return-argument.ll b/test/Transforms/IPConstantProp/return-argument.ll
index 53288ee1086..f8605107bdc 100644
--- a/test/Transforms/IPConstantProp/return-argument.ll
+++ b/test/Transforms/IPConstantProp/return-argument.ll
@@ -36,11 +36,14 @@ define void @caller(i1 %C) {
         ;; propagated per-caller).
         %S1 = call { i32, i32 } @foo(i32 1, i32 2);
         %X1 = extractvalue { i32, i32 } %S1, 0
-        %S2 = call { i32, i32 } @foo(i32 3, i32 4);
+        %S2 = invoke { i32, i32 } @foo(i32 3, i32 4) to label %OK unwind label %RET;
+OK:
         %X2 = extractvalue { i32, i32 } %S2, 0
         ;; Do some stuff with the returned values which we can grep for
         %Z  = add i32 %X1, %X2
         store i32 %Z, i32* %W
+        br label %RET
+RET:
         ret void
 }
 
diff --git a/test/Transforms/IPConstantProp/return-constant.ll b/test/Transforms/IPConstantProp/return-constant.ll
index 82ad902f421..381ef63cc88 100644
--- a/test/Transforms/IPConstantProp/return-constant.ll
+++ b/test/Transforms/IPConstantProp/return-constant.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | opt -ipconstprop -instcombine | \
-; RUN:    llvm-dis | grep {ret i1 true}
+; RUN:    llvm-dis | grep {ret i1 true} | count 2
 define internal i32 @foo(i1 %C) {
         br i1 %C, label %T, label %F
 
@@ -16,3 +16,11 @@ define i1 @caller(i1 %C) {
         ret i1 %Y
 }
 
+define i1 @invokecaller(i1 %C) {
+        %X = invoke i32 @foo( i1 %C ) to label %OK unwind label %FAIL             ; <i32> [#uses=1]
+OK:
+        %Y = icmp ne i32 %X, 0          ; <i1> [#uses=1]
+        ret i1 %Y 
+FAIL:
+        ret i1 false
+}