diff --git a/test/Assembler/2007-01-16-CrashOnBadCast.ll b/test/Assembler/2007-01-16-CrashOnBadCast.ll
new file mode 100644
index 00000000000..5e113001642
--- /dev/null
+++ b/test/Assembler/2007-01-16-CrashOnBadCast.ll
@@ -0,0 +1,8 @@
+; PR1117
+; RUN: llvm-as < %s 2>&1 > /dev/null | \
+; RUN:  grep "invalid cast opcode for cast from"
+
+define i8* %nada(i64 %X) {
+    %result = trunc i64 %X to i8*
+    ret i8* %result
+}
diff --git a/test/Assembler/2007-01-16-CrashOnBadCast2.ll b/test/Assembler/2007-01-16-CrashOnBadCast2.ll
new file mode 100644
index 00000000000..80cbeaccb75
--- /dev/null
+++ b/test/Assembler/2007-01-16-CrashOnBadCast2.ll
@@ -0,0 +1,5 @@
+; PR1117
+; RUN: llvm-as < %s 2>&1 > /dev/null | \
+; RUN:  grep "invalid cast opcode for cast from"
+
+%X = constant i8* trunc (i64 0 to i8*)