2 files changed, 6 insertions, 7 deletions
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java
index 65ec070d744..473f7685e86 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeResourcesTest.java
@@ -3,7 +3,6 @@ package com.yahoo.config.provision;
 
 import com.yahoo.config.provision.NodeResources.Architecture;
 import com.yahoo.config.provision.NodeResources.DiskSpeed;
-import com.yahoo.config.provision.NodeResources.GpuResources;
 import com.yahoo.config.provision.NodeResources.StorageType;
 import org.junit.jupiter.api.Test;
 
@@ -93,9 +92,9 @@ class NodeResourcesTest {
         assertEquals(3, empty.withUnspecifiedFieldsFrom(empty.withVcpu(3)).vcpu());
         assertEquals(2, empty.withVcpu(2).withUnspecifiedFieldsFrom(empty.withVcpu(3)).vcpu());
 
-        assertEquals(0, empty.withUnspecifiedFieldsFrom(empty).memoryGb());
-        assertEquals(3, empty.withUnspecifiedFieldsFrom(empty.withMemoryGb(3)).memoryGb());
-        assertEquals(2, empty.withMemoryGb(2).withUnspecifiedFieldsFrom(empty.withMemoryGb(3)).memoryGb());
+        assertEquals(0, empty.withUnspecifiedFieldsFrom(empty).memoryGiB());
+        assertEquals(3, empty.withUnspecifiedFieldsFrom(empty.withMemoryGiB(3)).memoryGiB());
+        assertEquals(2, empty.withMemoryGiB(2).withUnspecifiedFieldsFrom(empty.withMemoryGiB(3)).memoryGiB());
 
         assertEquals(0, empty.withUnspecifiedFieldsFrom(empty).diskGb());
         assertEquals(3, empty.withUnspecifiedFieldsFrom(empty.withDiskGb(3)).diskGb());
@@ -132,7 +131,7 @@ class NodeResourcesTest {
 
         var other = resources.with(new NodeResources.GpuResources(4, 32));
         var expected = resources.withVcpu(2)
-                .withMemoryGb(4)
+                .withMemoryGiB(4)
                 .withDiskGb(6)
                 .withBandwidthGbps(2)
                 .with(new NodeResources.GpuResources(1, 192));
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/SystemNameTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/SystemNameTest.java
index 2db395caece..0e3e2b10531 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/SystemNameTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/SystemNameTest.java
@@ -20,7 +20,7 @@ public class SystemNameTest {
 
     @Test
     void allOf() {
-        assertEquals(Set.of(SystemName.cd, SystemName.PublicCd), SystemName.allOf(SystemName::isCd));
-        assertEquals(Set.of(SystemName.PublicCd, SystemName.Public), SystemName.allOf(SystemName::isPublic));
+        assertEquals(Set.of(SystemName.cd, SystemName.PublicCd, SystemName.PublicCdMigration), SystemName.allOf(SystemName::isCd));
+        assertEquals(Set.of(SystemName.PublicCd, SystemName.Public, SystemName.PublicCdMigration), SystemName.allOf(SystemName::isPublic));
     }
 }