diff --git a/test/Transforms/SimplifyLibCalls/MemSet.ll b/test/Transforms/SimplifyLibCalls/MemSet.ll
index 75794404ad8..4bd358df899 100644
--- a/test/Transforms/SimplifyLibCalls/MemSet.ll
+++ b/test/Transforms/SimplifyLibCalls/MemSet.ll
@@ -1,17 +1,17 @@
 ; Test that the LLVMMemSetOptimizer works correctly
 ; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*llvm.memset'
 
-declare sbyte* %llvm.memset(sbyte*,ubyte,uint,uint)
+declare void %llvm.memset(sbyte*,ubyte,uint,uint)
 
 implementation   ; Functions:
 
 int %main () {
   %target = alloca [1024 x sbyte]
   %target_p = getelementptr [1024 x sbyte]* %target, int 0, int 0
-  call sbyte* %llvm.memset(sbyte* %target_p, ubyte 1, uint 0, uint 1)
-  call sbyte* %llvm.memset(sbyte* %target_p, ubyte 1, uint 1, uint 1)
-  call sbyte* %llvm.memset(sbyte* %target_p, ubyte 1, uint 2, uint 2)
-  call sbyte* %llvm.memset(sbyte* %target_p, ubyte 1, uint 4, uint 4)
-  call sbyte* %llvm.memset(sbyte* %target_p, ubyte 1, uint 8, uint 8)
+  call void %llvm.memset(sbyte* %target_p, ubyte 1, uint 0, uint 1)
+  call void %llvm.memset(sbyte* %target_p, ubyte 1, uint 1, uint 1)
+  call void %llvm.memset(sbyte* %target_p, ubyte 1, uint 2, uint 2)
+  call void %llvm.memset(sbyte* %target_p, ubyte 1, uint 4, uint 4)
+  call void %llvm.memset(sbyte* %target_p, ubyte 1, uint 8, uint 8)
   ret int 0
 }
diff --git a/test/Transforms/SimplifyLibCalls/StrChr.ll b/test/Transforms/SimplifyLibCalls/StrChr.ll
new file mode 100644
index 00000000000..7594fee4b16
--- /dev/null
+++ b/test/Transforms/SimplifyLibCalls/StrChr.ll
@@ -0,0 +1,19 @@
+; Test that the StrChrOptimizer works correctly
+; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*strchr'
+
+declare sbyte* %strchr(sbyte*,int)
+declare int %puts(sbyte*)
+%hello = constant [14 x sbyte] c"hello world\n\00"
+%null = constant [1 x sbyte] c"\00"
+
+implementation   ; Functions:
+
+int %main () {
+  %hello_p = getelementptr [14 x sbyte]* %hello, int 0, int 0
+  %null_p = getelementptr [1 x sbyte]* %null, int 0, int 0
+
+  %world  = call sbyte* %strchr(sbyte* %hello_p, int 119 )
+  %ignore = call sbyte* %strchr(sbyte* %null_p, int 119 )
+  %result = call int %puts(sbyte* %world)
+  ret int %result
+}