diff --git a/test/case/ietf_system/upgrade/test.py b/test/case/ietf_system/upgrade/test.py
index 6535dc433..1ef6be830 100755
--- a/test/case/ietf_system/upgrade/test.py
+++ b/test/case/ietf_system/upgrade/test.py
@@ -25,30 +25,16 @@
     BUNDLEDIR,
     "package"
 )
-
-class Uboot:
-    def __init__(self, ssh):
-        self.ssh=ssh
-
-    def get_boot_order(self):
-        order=self.ssh.runsh("sudo fw_printenv BOOT_ORDER").stdout.split("=")
-        return order[1].strip()
-
-    def set_boot_order(self, order):
-        return self.ssh.run(f"sudo fw_setenv BOOT_ORDER '{order}'".split()).returncode
-
-class Grub:
-    def __init__(self, ssh):
-        self.ssh = ssh
-
-    def get_boot_order(self):
-        lines=self.ssh.runsh("grub-editenv /mnt/aux/grub/grubenv list").stdout.split("\n")
-        for line in lines:
-            if "ORDER" in line:
-                return line.split("=")[1].strip()
-
-    def set_boot_order(self, order):
-        return self.ssh.run(f"sudo grub-editenv /mnt/aux/grub/grubenv set ORDER='{order}'".split()).returncode
+def get_boot_order(target):
+    oper = target.get_dict("/system-state/software")
+    return " ".join(oper["system-state"]["software"]["boot-order"])
+
+def set_boot_order(target, order):
+    target.call_dict("infix-system", {
+        "set-boot-order": {
+            "boot-order": order.split(" ")
+        }
+    })
 
 with infamy.Test() as test:
     with test.step("Set up topology and attach to target DUT"):
@@ -65,16 +51,8 @@ def set_boot_order(self, order):
         os.symlink(os.path.abspath(env.args.package), PKGPATH)
 
         target = env.attach("target", "mgmt", "netconf")
-        target_ssh = env.attach("target", "mgmt", "ssh")
-        if target_ssh.run("test -e /sys/firmware/devicetree/base/chosen/u-boot,version".split()).returncode == 0:
-            bootloader=Uboot(target_ssh)
-        elif target_ssh.run("test -e /mnt/aux/grub/grubenv".split()).returncode == 0:
-            bootloader=Grub(target_ssh)
-        else:
-            print("No supported bootloader found")
-            test.skip()
 
-        old_bootorder=bootloader.get_boot_order()
+        old_bootorder=get_boot_order(target)
         print(f"Initial bootorder: {repr(old_bootorder)}")
 
         _, hport = env.ltop.xlate("host", "data")
@@ -130,7 +108,9 @@ def set_boot_order(self, order):
                 test.fail()
 
         with test.step("Verify boot order has changed and reboot"):
-            assert(old_bootorder != bootloader.get_boot_order())
+            print(get_boot_order(target))
+            print(old_bootorder)
+            assert(old_bootorder != get_boot_order(target))
             target.reboot()
 
             if not wait_boot(target, env):
@@ -139,7 +119,7 @@ def set_boot_order(self, order):
 
 
         with test.step("Verify that the partition is the booted"):
-            should_boot=bootloader.get_boot_order().split()[0]
+            should_boot=get_boot_order(target).split()[0]
             oper = target.get_dict("/system-state/software")
             booted = oper["system-state"]["software"]["booted"]
             print(f"Should boot: {should_boot}, booted: {booted}")
@@ -147,16 +127,15 @@ def set_boot_order(self, order):
 
         with test.step("Restore boot order to original configured"):
             print(f"Restore boot order to {old_bootorder}")
-            if bootloader.set_boot_order(old_bootorder) != 0:
-                test.fail()
             target = env.attach("target", "mgmt", "netconf")
+            set_boot_order(target, old_bootorder)
             target.reboot()
             if not wait_boot(target, env):
                 test.fail()
             target = env.attach("target", "mgmt", "netconf")
 
         with test.step("Verify the boot order is the orignal configured"):
-            order = bootloader.get_boot_order()
+            order = get_boot_order(target)
             assert order == old_bootorder, f"Unexpected bootorder: {repr(order)}"
 
     test.succeed()
diff --git a/test/infamy/restconf.py b/test/infamy/restconf.py
index 52b3aef78..4cb7de713 100644
--- a/test/infamy/restconf.py
+++ b/test/infamy/restconf.py
@@ -302,6 +302,9 @@ def put_config_dict(self, modname, edit):
 
         return self.put_datastore("running", data)
 
+    def call_dict(self, model, call):
+        pass # Need implementation
+
     def call_rpc(self, rpc):
         """Actually send a POST to RESTCONF server"""
         url = f"{self.rpc_url}/{rpc}"
diff --git a/test/infamy/transport.py b/test/infamy/transport.py
index 61daae9d8..3c754a94a 100644
--- a/test/infamy/transport.py
+++ b/test/infamy/transport.py
@@ -47,6 +47,10 @@ def get_current_time_with_offset(self):
         """Needed since libyang is too nice and removes the original offset"""
         pass
 
+    @abstractmethod
+    def call_dict(self, module, call):
+        pass
+
     @abstractmethod
     def call_action(self, xpath):
         pass