diff --git a/test/Assembler/2007-02-07-BasicBlockRename.ll b/test/Assembler/2007-02-07-BasicBlockRename.ll
new file mode 100644
index 00000000000..084dc691567
--- /dev/null
+++ b/test/Assembler/2007-02-07-BasicBlockRename.ll
@@ -0,0 +1,14 @@
+; PR1187
+; RUN: llvm-upgrade < %s | llvm-as > /dev/null
+
+implementation
+
+int @main(int %argc, sbyte** %argv) {
+entry:
+	%exit = alloca int, align 4		; <i32*> [#uses=11]
+        store int 0, int* %exit
+	br label %exit
+
+exit:
+	ret int 0
+}
diff --git a/test/Assembler/2007-02-07-UpgradeGVarConflict.ll b/test/Assembler/2007-02-07-UpgradeGVarConflict.ll
new file mode 100644
index 00000000000..06e9525ee90
--- /dev/null
+++ b/test/Assembler/2007-02-07-UpgradeGVarConflict.ll
@@ -0,0 +1,19 @@
+; For PR1187
+; RUN: llvm-upgrade < %s > /dev/null
+
+%struct.isc_hash_t = type { uint, sbyte*, int, uint, uint, 
+                            [4 x ubyte], ulong, ushort* }
+%hash = internal global %struct.isc_hash_t* null
+
+implementation
+
+void %somefunc() {
+  %key_addr = alloca sbyte*
+  %tmp21 = load sbyte** %key_addr
+  %tmp22 = call fastcc uint %hash(sbyte* %tmp21, uint 0)
+  ret void
+}
+
+internal fastcc uint %hash(sbyte* %key, uint %case_sensitive) {
+  ret uint 0
+}