diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AbstractConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AbstractConfiguredTargetTest.java
new file mode 100644
index 0000000..56a4743
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AbstractConfiguredTargetTest.java
@@ -0,0 +1,67 @@
+// Copyright 2020 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.devtools.build.lib.analysis;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSortedSet;
+import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.util.ActionsTestUtil;
+import com.google.devtools.build.lib.analysis.configuredtargets.AbstractConfiguredTarget;
+import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/**
+ * Tests for {@link AbstractConfiguredTarget}
+ */
+@RunWith(JUnit4.class)
+public class AbstractConfiguredTargetTest extends BuildViewTestCase {
+
+  @Test
+  public void testRunfilesProviderIsNotImportant() throws Exception {
+    ConfiguredTarget x =
+        scratchConfiguredTarget(
+            "java/a",
+            "a",
+            "java_binary(name='a', srcs=['A.java'], deps=[':b'])",
+            "java_library(name='b', srcs=['B.java'])");
+
+    ImmutableSet<Artifact> artifacts =
+        TopLevelArtifactHelper.getAllArtifactsToBuild(
+                x,
+                new TopLevelArtifactContext(
+                    /*runTestsExclusively=*/ false,
+                    /*expandFilesets=*/ false,
+                    /*outputGroups=*/ ImmutableSortedSet.<String>of(
+                        OutputGroupInfo.DEFAULT, OutputGroupInfo.HIDDEN_TOP_LEVEL)))
+            .getImportantArtifacts()
+            .toSet();
+
+    assertThat(ActionsTestUtil.baseArtifactNames(artifacts)).doesNotContain("libb.jar");
+  }
+
+  @Test
+  public void testRunUnderWithExperimental() throws Exception {
+    scratch.file("foo/BUILD",
+        "sh_test(name = 'test', srcs = ['test.sh'], data = ['test.txt'])");
+    scratch.file("experimental/bar/BUILD",
+        "sh_binary(name = 'bar', srcs = ['test.sh'])");
+    useConfiguration("--run_under=//experimental/bar");
+    getConfiguredTarget("//foo:test");
+  }
+}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/CachingTest.java b/src/test/java/com/google/devtools/build/lib/analysis/CachingTest.java
new file mode 100644
index 0000000..58ae4a0
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/analysis/CachingTest.java
@@ -0,0 +1,65 @@
+// Copyright 2020 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.devtools.build.lib.analysis;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.devtools.build.lib.actions.Action;
+import com.google.devtools.build.lib.actions.ActionInput;
+import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.analysis.actions.SpawnAction;
+import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
+import java.util.HashSet;
+import java.util.Set;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Tests to verify that Bazel actions don't poison any output cache. */
+@RunWith(JUnit4.class)
+public class CachingTest extends BuildViewTestCase {
+  /**
+   * Regression test for bugs #2317593 and #2284024: Don't expand runfile middlemen.
+   */
+  @Test
+  public void testRunfilesManifestNotAnInput() throws Exception {
+    scratch.file(
+        "x/BUILD",
+        "sh_binary(name = 'tool', srcs = ['tool.sh'], data = ['tool.data'])",
+        "genrule(name = 'x', tools = [':tool'], outs = ['x.out'], cmd = 'dummy')");
+
+    Set<Action> actions = new HashSet<>();
+    for (Artifact artifact : getFilesToBuild(getConfiguredTarget("//x:x")).toList()) {
+      actions.add(getGeneratingAction(artifact));
+    }
+
+    boolean lookedAtAnyAction = false;
+    boolean foundRunfilesMiddlemanSoRunfilesAreCorrectlyStaged = false;
+    for (Action action : actions) {
+      if (action instanceof SpawnAction) {
+        for (ActionInput string : ((SpawnAction) action).getSpawn().getInputFiles().toList()) {
+          lookedAtAnyAction = true;
+          if (string.getExecPathString().endsWith("x_Stool-runfiles")) {
+            foundRunfilesMiddlemanSoRunfilesAreCorrectlyStaged = true;
+          } else {
+            assertThat(string.getExecPathString().endsWith(".runfiles/MANIFEST")).isFalse();
+          }
+        }
+      }
+    }
+    assertThat(lookedAtAnyAction).isTrue();
+    assertThat(foundRunfilesMiddlemanSoRunfilesAreCorrectlyStaged).isTrue();
+  }
+}