diff --git a/.bazelrc b/.bazelrc
index 14677de162f..5616cb0d3e7 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -802,7 +802,7 @@ test:macos_x86_wheel_test --@local_xla//third_party/py:wheel_dependency=true --c
 test:windows_x86_cpu_2022_wheel_test_filters --test_tag_filters=-no_windows,-windows_excluded,-no_oss,-oss_excluded,-gpu,-tpu,-benchmark-test,-v1only
 test:windows_x86_cpu_2022_wheel_test_filters --build_tag_filters=-no_windows,-windows_excluded,-no_oss,-oss_excluded,-benchmark-test,-v1only
 test:windows_x86_cpu_2022_wheel_test_filters --test_lang_filters=cc,py --test_size_filters=small,medium --test_timeout="300,450,1200,3600"
-test:windows_x86_cpu_2022_wheel_test --build_tests_only --config=windows_x86_cpu_pycpp_test_filters -- //tensorflow/... -//tensorflow/java/... -//tensorflow/lite/... -//tensorflow/compiler/...
+test:windows_x86_cpu_2022_wheel_test --build_tests_only --config=windows_x86_cpu_pycpp_test_filters -- //tensorflow/... //tensorflow/tools/pip_package:prebuilt_wheel_import_api_packages_test_cpu -//tensorflow/java/... -//tensorflow/lite/... -//tensorflow/compiler/...
 
 # PYCPP TESTS run a suite of Python and C++ tests to verify general correctness over
 # the whole TF code base. These are usually run continuously or upon presubmit.
@@ -858,7 +858,7 @@ test:windows_x86_cpu_2022_pycpp_test_filters --test_tag_filters=-no_windows,-win
 test:windows_x86_cpu_2022_pycpp_test_filters --build_tag_filters=-no_windows,-windows_excluded,-no_oss,-tf_tosa,-oss_excluded,-benchmark-test,-v1only
 test:windows_x86_cpu_2022_pycpp_test_filters --test_lang_filters=cc,py --test_size_filters=small,medium --test_timeout="300,450,1200,3600"
 test:windows_x86_cpu_2022_pycpp_test_opts --config=windows_x86_cpu_2022_pycpp_test_build_opts --build_tests_only
-test:windows_x86_cpu_2022_pycpp_test --config=windows_x86_cpu_2022_pycpp_test_opts --config=windows_x86_cpu_2022_pycpp_test_filters -- //tensorflow/... -//tensorflow/java/... -//tensorflow/lite/... -//tensorflow/compiler/...
+test:windows_x86_cpu_2022_pycpp_test --config=windows_x86_cpu_2022_pycpp_test_opts --config=windows_x86_cpu_2022_pycpp_test_filters -- //tensorflow/... //tensorflow/tools/pip_package:import_api_packages_test_cpu -//tensorflow/java/... -//tensorflow/lite/... -//tensorflow/compiler/...
 
 # END TF TEST SUITE OPTIONS
 
diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD
index 62033c5d312..44b5b579fda 100644
--- a/tensorflow/tools/pip_package/BUILD
+++ b/tensorflow/tools/pip_package/BUILD
@@ -361,7 +361,6 @@ py_test(
     tags = [
         "cpu",
         "manual",
-        "windows_excluded",
     ],
     deps = if_wheel_dependency(tf_wheel_dep()),
 )
@@ -380,7 +379,6 @@ py_test(
     tags = [
         "gpu",
         "manual",
-        "windows_excluded",
     ],
     deps = if_wheel_dependency(tf_wheel_dep()),
 )
@@ -392,7 +390,6 @@ py_test(
     tags = [
         "cpu",
         "manual",
-        "windows_excluded",
     ],
     deps = [
         ":tf_py_import",
@@ -410,7 +407,6 @@ py_test(
     tags = [
         "gpu",
         "manual",
-        "windows_excluded",
     ],
     deps = [
         ":tf_py_import",