diff --git a/test/Transforms/SimplifyLibCalls/2005-04-24-ExitInMain.ll b/test/Transforms/SimplifyLibCalls/ExitInMain.ll
similarity index 100%
rename from test/Transforms/SimplifyLibCalls/2005-04-24-ExitInMain.ll
rename to test/Transforms/SimplifyLibCalls/ExitInMain.ll
diff --git a/test/Transforms/SimplifyLibCalls/2005-04-24-strcat.ll b/test/Transforms/SimplifyLibCalls/StrCat.ll
similarity index 100%
rename from test/Transforms/SimplifyLibCalls/2005-04-24-strcat.ll
rename to test/Transforms/SimplifyLibCalls/StrCat.ll
diff --git a/test/Transforms/SimplifyLibCalls/StrLen.ll b/test/Transforms/SimplifyLibCalls/StrLen.ll
new file mode 100644
index 00000000000..0e1750162f9
--- /dev/null
+++ b/test/Transforms/SimplifyLibCalls/StrLen.ll
@@ -0,0 +1,21 @@
+; Test that the StrCatOptimizer works correctly
+; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | not grep 'call.*strlen'
+
+declare int %strlen(sbyte*)
+%hello = constant [6 x sbyte] c"hello\00"
+%null = constant [1 x sbyte] c"\00"
+%null_hello = constant [7 x sbyte] c"\00hello\00"
+
+implementation   ; Functions:
+
+int %main () {
+  %hello_p = getelementptr [6 x sbyte]* %hello, int 0, int 0
+  %hello_l = call int %strlen(sbyte* %hello_p)
+  %null_p = getelementptr [1 x sbyte]* %null, int 0, int 0
+  %null_l = call int %strlen(sbyte* %null_p)
+  %null_hello_p = getelementptr [7 x sbyte]* %null_hello, int 0, int 0
+  %null_hello_l = call int %strlen(sbyte* %null_hello_p)
+  %sum1 = add int %hello_l, %null_l
+  %sum2 = add int %sum1, %null_hello_l
+  ret int %sum2
+}