diff --git a/float_models/iree_exec/mnist.c b/float_models/iree_exec/mnist.c
index fb560f4..e40197e 100644
--- a/float_models/iree_exec/mnist.c
+++ b/float_models/iree_exec/mnist.c
@@ -52,7 +52,7 @@
 }
 
 iree_hal_executable_library_query_fn_t library_query(void) {
-  return &mnist_linked_llvm_library_query;
+  return &mnist_linked_llvm_cpu_library_query;
 }
 
 iree_status_t load_input_data(const MlModel *model, void **buffer,
diff --git a/float_models/iree_exec/mnist_test.run b/float_models/iree_exec/mnist_test.run
index afe31ce..c161a4e 100644
--- a/float_models/iree_exec/mnist_test.run
+++ b/float_models/iree_exec/mnist_test.run
@@ -3,4 +3,3 @@
 
 // RUN: ${TEST_RUNNER_CMD} %S/mnist_emitc_static 2>&1 | tee %t
 // RUN: cat %t | FileCheck %S/mnist_test.filecheck
-// XFAIL: *
diff --git a/float_models/iree_exec/mobilenet_v1.c b/float_models/iree_exec/mobilenet_v1.c
index 0dc5710..d6a6a1d 100644
--- a/float_models/iree_exec/mobilenet_v1.c
+++ b/float_models/iree_exec/mobilenet_v1.c
@@ -53,9 +53,9 @@
 
 iree_hal_executable_library_query_fn_t library_query(void) {
 #if !defined(BUILD_EMITC)
-  return &mobilenet_v1_bytecode_module_static_linked_llvm_library_query;
+  return &mobilenet_v1_bytecode_module_static_linked_llvm_cpu_library_query;
 #else
-  return &mobilenet_v1_c_module_static_linked_llvm_library_query;
+  return &mobilenet_v1_c_module_static_linked_llvm_cpu_library_query;
 #endif
 }
 
diff --git a/float_models/iree_exec/mobilenet_v1_test.run b/float_models/iree_exec/mobilenet_v1_test.run
index e655bf2..3ccc914 100644
--- a/float_models/iree_exec/mobilenet_v1_test.run
+++ b/float_models/iree_exec/mobilenet_v1_test.run
@@ -3,4 +3,3 @@
 
 // RUN: ${TEST_RUNNER_CMD} %S/mobilenet_v1_emitc_static 2>&1 | tee %t
 // RUN: cat %t | FileCheck %S/mobilenet_v1_test.filecheck
-// XFAIL: *
diff --git a/quant_models/iree_exec/mobilenet_v1.c b/quant_models/iree_exec/mobilenet_v1.c
index f67f310..33f6352 100644
--- a/quant_models/iree_exec/mobilenet_v1.c
+++ b/quant_models/iree_exec/mobilenet_v1.c
@@ -53,9 +53,9 @@
 
 iree_hal_executable_library_query_fn_t library_query(void) {
 #if !defined(BUILD_EMITC)
-  return &mobilenet_v1_bytecode_module_static_linked_llvm_library_query;
+  return &mobilenet_v1_bytecode_module_static_linked_llvm_cpu_library_query;
 #else
-  return &mobilenet_v1_c_module_static_linked_llvm_library_query;
+  return &mobilenet_v1_c_module_static_linked_llvm_cpu_library_query;
 #endif
 }
 
diff --git a/quant_models/iree_exec/mobilenet_v1_test.run b/quant_models/iree_exec/mobilenet_v1_test.run
index e655bf2..3ccc914 100644
--- a/quant_models/iree_exec/mobilenet_v1_test.run
+++ b/quant_models/iree_exec/mobilenet_v1_test.run
@@ -3,4 +3,3 @@
 
 // RUN: ${TEST_RUNNER_CMD} %S/mobilenet_v1_emitc_static 2>&1 | tee %t
 // RUN: cat %t | FileCheck %S/mobilenet_v1_test.filecheck
-// XFAIL: *
diff --git a/quant_models/iree_exec/mobilenet_v2.c b/quant_models/iree_exec/mobilenet_v2.c
index 9169ee2..a3e70f4 100644
--- a/quant_models/iree_exec/mobilenet_v2.c
+++ b/quant_models/iree_exec/mobilenet_v2.c
@@ -53,9 +53,9 @@
 
 iree_hal_executable_library_query_fn_t library_query(void) {
 #if !defined(BUILD_EMITC)
-  return &mobilenet_v2_bytecode_module_static_linked_llvm_library_query;
+  return &mobilenet_v2_bytecode_module_static_linked_llvm_cpu_library_query;
 #else
-  return &mobilenet_v2_c_module_static_linked_llvm_library_query;
+  return &mobilenet_v2_c_module_static_linked_llvm_cpu_library_query;
 #endif
 }
 
diff --git a/quant_models/iree_exec/mobilenet_v2_test.run b/quant_models/iree_exec/mobilenet_v2_test.run
index f394158..57e2e22 100644
--- a/quant_models/iree_exec/mobilenet_v2_test.run
+++ b/quant_models/iree_exec/mobilenet_v2_test.run
@@ -3,4 +3,3 @@
 
 // RUN: ${TEST_RUNNER_CMD} %S/mobilenet_v2_emitc_static 2>&1 | tee %t
 // RUN: cat %t | FileCheck %S/mobilenet_v2_test.filecheck
-// XFAIL: *
diff --git a/quant_models/iree_exec/person_detection.c b/quant_models/iree_exec/person_detection.c
index 04e26f1..759b82f 100644
--- a/quant_models/iree_exec/person_detection.c
+++ b/quant_models/iree_exec/person_detection.c
@@ -53,9 +53,9 @@
 
 iree_hal_executable_library_query_fn_t library_query(void) {
 #if !defined(BUILD_EMITC)
-  return &person_detection_bytecode_module_static_linked_llvm_library_query;
+  return &person_detection_bytecode_module_static_linked_llvm_cpu_library_query;
 #else
-  return &person_detection_c_module_static_linked_llvm_library_query;
+  return &person_detection_c_module_static_linked_llvm_cpu_library_query;
 #endif
 }
 
diff --git a/quant_models/iree_exec/person_detection_test.run b/quant_models/iree_exec/person_detection_test.run
index 07d44fb..6f59441 100644
--- a/quant_models/iree_exec/person_detection_test.run
+++ b/quant_models/iree_exec/person_detection_test.run
@@ -3,4 +3,3 @@
 
 // RUN: ${TEST_RUNNER_CMD} %S/person_detection_emitc_static 2>&1 | tee %t
 // RUN: cat %t | FileCheck %S/person_detection_test.filecheck
-// XFAIL: *