diff --git a/test/Transforms/SimplifyLibCalls/2005-04-24-ExitInMain.ll b/test/Transforms/SimplifyLibCalls/2005-04-24-ExitInMain.ll
new file mode 100644
index 00000000000..f33eac072c4
--- /dev/null
+++ b/test/Transforms/SimplifyLibCalls/2005-04-24-ExitInMain.ll
@@ -0,0 +1,13 @@
+; Test that the ExitInMainOptimization pass works correctly
+; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | grep -c 'ret int 3' | grep 1
+
+declare void "exit"(int)
+declare void "exitonly"(int)
+
+implementation   ; Functions:
+
+int "main"() {
+        call void "exitonly" ( int 3 )
+        call void "exit" ( int 3 )
+        ret int 0
+}
diff --git a/test/Transforms/SimplifyLibCalls/dg.exp b/test/Transforms/SimplifyLibCalls/dg.exp
new file mode 100644
index 00000000000..e326ea721c3
--- /dev/null
+++ b/test/Transforms/SimplifyLibCalls/dg.exp
@@ -0,0 +1,3 @@
+load_lib llvm-dg.exp
+
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext