diff --git a/test/Transforms/SimplifyLibCalls/MemSet.ll b/test/Transforms/SimplifyLibCalls/MemSet.ll
new file mode 100644
index 0000000..7579440
--- /dev/null
+++ b/test/Transforms/SimplifyLibCalls/MemSet.ll
@@ -0,0 +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)
+
+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)
+  ret int 0
+}