diff --git a/llvm/test/CodeGen/Generic/2009-11-20-NewNode.ll b/llvm/test/CodeGen/MSP430/2009-11-20-NewNode.ll
similarity index 97%
rename from llvm/test/CodeGen/Generic/2009-11-20-NewNode.ll
rename to llvm/test/CodeGen/MSP430/2009-11-20-NewNode.ll
index 92d7628f842c..887c7d6fa24e 100644
--- a/llvm/test/CodeGen/Generic/2009-11-20-NewNode.ll
+++ b/llvm/test/CodeGen/MSP430/2009-11-20-NewNode.ll
@@ -1,5 +1,4 @@
 ; RUN: llc -march=msp430 < %s
-; RUN: llc -march=pic16 < %s
 ; PR5558
 
 define i64 @_strtoll_r(i16 %base) nounwind {
diff --git a/llvm/test/CodeGen/PIC16/2009-11-20-NewNode.ll b/llvm/test/CodeGen/PIC16/2009-11-20-NewNode.ll
new file mode 100644
index 000000000000..d68f0f41c4a5
--- /dev/null
+++ b/llvm/test/CodeGen/PIC16/2009-11-20-NewNode.ll
@@ -0,0 +1,36 @@
+; RUN: llc -march=pic16 < %s
+; PR5558
+
+define i64 @_strtoll_r(i16 %base) nounwind {
+entry:
+  br i1 undef, label %if.then, label %if.end27
+
+if.then:                                          ; preds = %do.end
+  br label %if.end27
+
+if.end27:                                         ; preds = %if.then, %do.end
+  %cond66 = select i1 undef, i64 -9223372036854775808, i64 9223372036854775807 ; <i64> [#uses=3]
+  %conv69 = sext i16 %base to i64                 ; <i64> [#uses=1]
+  %div = udiv i64 %cond66, %conv69                ; <i64> [#uses=1]
+  br label %for.cond
+
+for.cond:                                         ; preds = %if.end116, %if.end27
+  br i1 undef, label %if.then152, label %if.then93
+
+if.then93:                                        ; preds = %for.cond
+  br i1 undef, label %if.end116, label %if.then152
+
+if.end116:                                        ; preds = %if.then93
+  %cmp123 = icmp ugt i64 undef, %div              ; <i1> [#uses=1]
+  %or.cond = or i1 undef, %cmp123                 ; <i1> [#uses=0]
+  br label %for.cond
+
+if.then152:                                       ; preds = %if.then93, %for.cond
+  br i1 undef, label %if.end182, label %if.then172
+
+if.then172:                                       ; preds = %if.then152
+  ret i64 %cond66
+
+if.end182:                                        ; preds = %if.then152
+  ret i64 %cond66
+}