diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_library.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_library.bzl
index 66b5818433e1f6..a5ab377e3ad9c6 100755
--- a/src/main/starlark/builtins_bzl/common/cc/cc_library.bzl
+++ b/src/main/starlark/builtins_bzl/common/cc/cc_library.bzl
@@ -579,7 +579,6 @@ attrs = {
     ),
     "linkstamp": attr.label(allow_single_file = True),
     "linkopts": attr.string_list(),
-    "nocopts": attr.string(),
     "includes": attr.string_list(),
     "defines": attr.string_list(),
     "copts": attr.string_list(),
@@ -610,6 +609,7 @@ attrs = {
 attrs.update(semantics.get_distribs_attr())
 attrs.update(semantics.get_loose_mode_in_hdrs_check_allowed_attr())
 attrs.update(semantics.get_implementation_deps_allowed_attr())
+attrs.update(semantics.get_nocopts_attr())
 
 cc_library = rule(
     implementation = _cc_library_impl,
diff --git a/src/main/starlark/builtins_bzl/common/cc/semantics.bzl b/src/main/starlark/builtins_bzl/common/cc/semantics.bzl
index 58da8f90bb39ee..db2b0a351fe2f0 100644
--- a/src/main/starlark/builtins_bzl/common/cc/semantics.bzl
+++ b/src/main/starlark/builtins_bzl/common/cc/semantics.bzl
@@ -162,6 +162,9 @@ def _get_linkstatic_default(ctx):
         # Binaries link statically.
         return True
 
+def _get_nocopts_attr():
+    return {}
+
 semantics = struct(
     ALLOWED_RULES_IN_DEPS = [
         "cc_library",
@@ -201,4 +204,5 @@ semantics = struct(
     get_coverage_attrs = _get_coverage_attrs,
     get_coverage_env = _get_coverage_env,
     get_proto_aspects = _get_proto_aspects,
+    get_nocopts_attr = _get_nocopts_attr,
 )
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
index 0d9eb095ff8b83..e8ec390e132301 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
@@ -1248,6 +1248,9 @@ private static String removeOutDirectory(String s) {
 
   @Test
   public void testNoCoptsDisabled() throws Exception {
+    if (analysisMock.isThisBazel()) {
+      return;
+    }
     reporter.removeHandler(failFastHandler);
     scratch.file("x/BUILD", "cc_library(name = 'foo', srcs = ['a.cc'], nocopts = 'abc')");
     useConfiguration("--incompatible_disable_nocopts");
diff --git a/src/test/shell/integration/BUILD b/src/test/shell/integration/BUILD
index be0a6ad476d016..46f70b7e36609d 100644
--- a/src/test/shell/integration/BUILD
+++ b/src/test/shell/integration/BUILD
@@ -246,16 +246,6 @@ sh_test(
     toolchains = ["@bazel_tools//tools/jdk:current_java_runtime"],
 )
 
-sh_test(
-    name = "output_filter_test",
-    size = "large",
-    srcs = ["output_filter_test.sh"],
-    data = [
-        ":test-deps",
-        "@bazel_tools//tools/bash/runfiles",
-    ],
-)
-
 sh_test(
     name = "bazel_testjobs_test",
     srcs = ["bazel_testjobs_test.sh"],