diff --git a/tensorflow/lite/testing/BUILD b/tensorflow/lite/testing/BUILD
index ba36ff3a2d3..854729c9a4e 100644
--- a/tensorflow/lite/testing/BUILD
+++ b/tensorflow/lite/testing/BUILD
@@ -231,7 +231,6 @@ cc_library(
         ":split",
         ":test_runner",
         "@com_google_absl//absl/strings",
-        "//tensorflow/lite/c:common",
         "//tensorflow/lite:builtin_op_data",
         "//tensorflow/lite:framework",
         "//tensorflow/lite:string_util",
@@ -240,7 +239,7 @@ cc_library(
         "//tensorflow/lite/kernels:reference_ops",
         "//tensorflow/lite/kernels:test_delegate_providers_lib",
         "//tensorflow/lite/kernels/hashtable:hashtable_op_kernels",
-        "//tensorflow/lite/kernels/parse_example",
+        "//tensorflow/lite/kernels/parse_example:parse_example",
         "//tensorflow/lite/kernels/perception:perception_ops",
         "//tensorflow/lite/tools/evaluation:utils",
     ] + select({
diff --git a/tensorflow/lite/testing/tflite_driver.cc b/tensorflow/lite/testing/tflite_driver.cc
index 3d1fac2021a..22eda8cc539 100644
--- a/tensorflow/lite/testing/tflite_driver.cc
+++ b/tensorflow/lite/testing/tflite_driver.cc
@@ -21,7 +21,6 @@ limitations under the License.
 
 #include "absl/strings/escaping.h"
 #include "tensorflow/lite/builtin_op_data.h"
-#include "tensorflow/lite/c/common.h"
 #if !defined(__APPLE__)
 #include "tensorflow/lite/delegates/flex/delegate.h"
 #endif
@@ -82,7 +81,7 @@ unique_void_ptr make_type_erased_array(size_t size) {
 }
 
 bool IsQuantized(const TfLiteTensor& tensor) {
-  if (tensor.quantization.type == kTfLiteNoQuantization) return false;
+  if (tensor.type != kTfLiteInt8 && tensor.type != kTfLiteInt16) return false;
 
   if (tensor.quantization.params != nullptr) {
     auto* quantization =