diff --git a/morph_net/framework/BUILD b/morph_net/framework/BUILD
index 89a0364..bae820c 100644
--- a/morph_net/framework/BUILD
+++ b/morph_net/framework/BUILD
@@ -16,6 +16,7 @@ pytype_library(
 py_library(
     name = "batch_norm_source_op_handler",
     srcs = ["batch_norm_source_op_handler.py"],
+    tags = ["notap"],
     deps = [
         ":grouping_op_handler",
         ":tpu_util",
diff --git a/morph_net/tools/BUILD b/morph_net/tools/BUILD
index 8ba0ad6..ba0fad0 100644
--- a/morph_net/tools/BUILD
+++ b/morph_net/tools/BUILD
@@ -51,6 +51,7 @@ py_test(
         "configurable_ops_test.py",
     ],
     python_version = "PY2",
+    tags = ["notap"],
     deps = [
         ":configurable_ops",
         "//learning/brain/public:disable_tf2",  # build_cleaner: keep; go/disable_tf2