diff --git a/test/BugPoint/compile-custom.ll b/test/BugPoint/compile-custom.ll
new file mode 100755
index 00000000000..e9016ffb870
--- /dev/null
+++ b/test/BugPoint/compile-custom.ll
@@ -0,0 +1,12 @@
+; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext --compile-custom --compile-command="%s.py arg1 arg2" --output-prefix %t %s | FileCheck %s
+; REQUIRES: loadable_module
+
+; Test that arguments are correctly passed in --compile-command.  The output
+; of bugpoint includes the output of the custom tool, so we just echo the args
+; in the tool and check here.
+
+; CHECK: Error: arg1 arg2
+
+define void @noop() {
+    ret void
+}
diff --git a/test/BugPoint/compile-custom.ll.py b/test/BugPoint/compile-custom.ll.py
new file mode 100755
index 00000000000..32093557d69
--- /dev/null
+++ b/test/BugPoint/compile-custom.ll.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+
+import sys
+
+# Currently any print-out from the custom tool is interpreted as a crash
+# (i.e. test is still interesting)
+
+print "Error: " + ' '.join(sys.argv[1:])
+
+sys.exit(1)