diff --git a/test/Transforms/FunctionImport/funcimport_resolved.ll b/test/Transforms/FunctionImport/funcimport_resolved.ll
index e2a81804f84..ebf5fd3b055 100644
--- a/test/Transforms/FunctionImport/funcimport_resolved.ll
+++ b/test/Transforms/FunctionImport/funcimport_resolved.ll
@@ -12,6 +12,8 @@
 ; Require asserts so we can use -debug-only
 ; REQUIRES: asserts
 
+; REQUIRES: x86-registered-target
+
 ; RUN: opt -module-summary %s -o %t.bc
 ; RUN: opt -module-summary %p/Inputs/funcimport_resolved1.ll -o %t2.bc
 ; RUN: opt -module-summary %p/Inputs/funcimport_resolved2.ll -o %t3.bc
@@ -19,20 +21,18 @@
 ; First do a sanity check that all callees are imported with the default
 ; instruction limit
 ; RUN: llvm-lto2 run %t.bc %t2.bc %t3.bc -o %t4 -r=%t.bc,_main,pl -r=%t.bc,_linkonceodrfunc,l -r=%t.bc,_foo,l -r=%t2.bc,_foo,pl -r=%t2.bc,_linkonceodrfunc,pl -r=%t2.bc,_linkonceodrfunc2,pl -r=%t3.bc,_linkonceodrfunc,l -thinlto-threads=1 -debug-only=function-import 2>&1 | FileCheck %s --check-prefix=INSTLIMDEFAULT
-; INSTLIMDEFAULT: 4 functions imported from {{.*}}tmp2.bc
-; INSTLIMDEFAULT-DAG: importing function {{.*}}
-; INSTLIMDEFAULT-DAG: importing function {{.*}}
-; INSTLIMDEFAULT-DAG: importing function {{.*}}
-; INSTLIMDEFAULT-DAG: importing function {{.*}}
+; INSTLIMDEFAULT-DAG: Is importing function {{.*}} foo from {{.*}}funcimport_resolved1.ll
+; INSTLIMDEFAULT-DAG: Is importing function {{.*}} linkonceodrfunc from {{.*}}funcimport_resolved1.ll
+; INSTLIMDEFAULT-DAG: Is importing function {{.*}} linkonceodrfunc2 from {{.*}}funcimport_resolved1.ll
+; INSTLIMDEFAULT-DAG: Is importing function {{.*}} f from {{.*}}funcimport_resolved1.ll
 
 ; Now run with the lower threshold that will only allow linkonceodrfunc to be
 ; imported from funcimport_resolved1.ll the second time it is encountered.
 ; RUN: llvm-lto2 run %t.bc %t2.bc %t3.bc -o %t4 -r=%t.bc,_main,pl -r=%t.bc,_linkonceodrfunc,l -r=%t.bc,_foo,l -r=%t2.bc,_foo,pl -r=%t2.bc,_linkonceodrfunc,pl -r=%t2.bc,_linkonceodrfunc2,pl -r=%t3.bc,_linkonceodrfunc,l -thinlto-threads=1 -debug-only=function-import -import-instr-limit=8 2>&1 | FileCheck %s --check-prefix=INSTLIM8
-; INSTLIM8: 3 functions imported from {{.*}}tmp2.bc
-; INSTLIM8-DAG: importing function {{.*}}
-; INSTLIM8-DAG: importing function {{.*}}
-; INSTLIM8-DAG: importing function {{.*}}
-; INSTLIM8-DAG: importing function {{.*}}
+; INSTLIM8-DAG: Is importing function {{.*}} foo from {{.*}}funcimport_resolved1.ll
+; INSTLIM8-DAG: Is importing function {{.*}} linkonceodrfunc from {{.*}}funcimport_resolved1.ll
+; INSTLIM8-DAG: Not importing function {{.*}} linkonceodrfunc2 from {{.*}}funcimport_resolved1.ll
+; INSTLIM8-DAG: Is importing function {{.*}} f from {{.*}}funcimport_resolved1.ll
 
 target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-apple-macosx10.11.0"