diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index c1cad38f18e635..7d80e235c669b0 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -525,11 +525,13 @@ private void setUpSkyframe() {
   protected void setPackageOptions(String... options) throws Exception {
     packageOptions = parsePackageOptions(options);
     setUpSkyframe();
+    invalidatePackages(/* alsoConfigs= */ false);
   }
 
   protected void setBuildLanguageOptions(String... options) throws Exception {
     buildLanguageOptions = parseBuildLanguageOptions(options);
     setUpSkyframe();
+    invalidatePackages(/* alsoConfigs= */ false);
   }
 
   private static PackageOptions parsePackageOptions(String... options) throws Exception {
diff --git a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
index 05ade6e582fa43..1c092c130c0146 100644
--- a/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
@@ -3473,7 +3473,6 @@ public void testLicenseType() throws Exception {
     // (See --incompatible_no_attr_license). However, this verifies that until the attribute
     // is removed, values of the attribute are a valid Starlark type.
     setBuildLanguageOptions("--incompatible_no_attr_license=false");
-    invalidatePackages();
     scratch.file(
         "test/rule.bzl",
         """