1 files changed, 5 insertions, 6 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java
index 1c0f5697f1..86bbf073f6 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/RegisteredToolchainsFunctionTest.java
@@ -57,10 +57,9 @@ public class RegisteredToolchainsFunctionTest extends ToolchainTestCase {
     assertThatEvaluationResult(result).hasEntryThat(toolchainsKey).isNotNull();
 
     RegisteredToolchainsValue value = result.get(toolchainsKey);
-    // We have two registered toolchains, and one default for c++
-    assertThat(value.registeredToolchains()).hasSize(3);
+    assertThat(value.registeredToolchains()).hasSize(2);
 
-    DeclaredToolchainInfo registeredToolchain1 = value.registeredToolchains().get(1);
+    DeclaredToolchainInfo registeredToolchain1 = value.registeredToolchains().get(0);
     assertThat(registeredToolchain1).isNotNull();
 
     assertThat(registeredToolchain1.toolchainType()).isEqualTo(testToolchainType);
@@ -69,7 +68,7 @@ public class RegisteredToolchainsFunctionTest extends ToolchainTestCase {
     assertThat(registeredToolchain1.toolchainLabel())
         .isEqualTo(makeLabel("//toolchain:test_toolchain_1"));
 
-    DeclaredToolchainInfo registeredToolchain2 = value.registeredToolchains().get(2);
+    DeclaredToolchainInfo registeredToolchain2 = value.registeredToolchains().get(1);
     assertThat(registeredToolchain2).isNotNull();
 
     assertThat(registeredToolchain2.toolchainType()).isEqualTo(testToolchainType);
@@ -138,7 +137,7 @@ public class RegisteredToolchainsFunctionTest extends ToolchainTestCase {
         requestToolchainsFromSkyframe(toolchainsKey);
     assertThatEvaluationResult(result).hasNoError();
     assertToolchainLabels(result.get(toolchainsKey))
-        .contains(makeLabel("//toolchain:test_toolchain_1"));
+        .containsExactly(makeLabel("//toolchain:test_toolchain_1"));
 
     // Re-write the WORKSPACE.
     rewriteWorkspace("register_toolchains('//toolchain:toolchain_2')");
@@ -147,7 +146,7 @@ public class RegisteredToolchainsFunctionTest extends ToolchainTestCase {
     result = requestToolchainsFromSkyframe(toolchainsKey);
     assertThatEvaluationResult(result).hasNoError();
     assertToolchainLabels(result.get(toolchainsKey))
-        .contains(makeLabel("//toolchain:test_toolchain_2"));
+        .containsExactly(makeLabel("//toolchain:test_toolchain_2"));
   }
 
   @Test