diff --git a/v2v/tests/cfg/function_test_esx.cfg b/v2v/tests/cfg/function_test_esx.cfg
index 67d889ec8b..852e479022 100644
--- a/v2v/tests/cfg/function_test_esx.cfg
+++ b/v2v/tests/cfg/function_test_esx.cfg
@@ -179,20 +179,40 @@
                     main_vm = VM_NAME_WIN2019_V2V_EXAMPLE
                     os_version = "win2019"
                 - mac_ip:
-                    checkpoint = 'mac_ip'
+                    only libvirt
                     variants:
-                        - 1_dhcp:
-                            only esx_70
-                            main_vm = VM_NAME_WIN_1_DHCP_IP_V2V_EXAMPLE
-                            v2v_opts = VM_NAME_WIN_1_DHCP_IP_MAC_CONF_V2V_EXAMPLE
+                        - 3_mac:
+                            only esx_80
+                            boottype = 3
+                            variants:
+                                - win2016:
+                                    main_vm = VM_NAME_WIN2016_EFI_V2V_EXAMPLE
+                                    v2v_opts = VM_NAME_WIN_3_DHCP_IP_MAC_CONF_V2V_EXAMPLE
+                                - win2022: 
+                                    main_vm = VM_NAME_WIN2022_EFI_V2V_EXAMPLE
+                                    v2v_opts = VM_NAME_WIN_3_DHCP_IP_MAC_CONF_V2V_EXAMPLE
+                        - 0_gw:  
+                            only esx_80
+                            boottype = 3
+                            variants:
+                                - win10:
+                                    main_vm = VM_NAME_WIN10_EFI_V2V_EXAMPLE
+                                    v2v_opts = VM_NAME_WIN_0_GW_IP_MAC_CONF_V2V_EXAMPLE
+                                - win2025:
+                                    main_vm = VM_NAME_WIN2025_EFI_V2V_EXAMPLE
+                                    v2v_opts = VM_NAME_WIN_0_GW_IP_MAC_CONF_V2V_EXAMPLE 
                         - 1_static:
-                            only esx_70
-                            main_vm = VM_NAME_WIN_1_STATIC_IP_V2V_EXAMPLE
-                            v2v_opts = VM_NAME_WIN_1_STATIC_IP_MAC_CONF_V2V_EXAMPLE
-                        - 3_dhcp:
-                            only esx_70
-                            main_vm = VM_NAME_WIN_3_DHCP_IP_V2V_EXAMPLE
-                            v2v_opts = VM_NAME_WIN_3_DHCP_IP_MAC_CONF_V2V_EXAMPLE
+                            only esx_80
+                            checkpoint = 'mac_ip'
+                            variants:
+                                - win2019:
+                                    main_vm = VM_NAME_ESX80_WIN2019_V2V_EXAMPLE
+                                    v2v_opts =  VM_NAME_WIN_1_STATIC_IP_MAC_CONF_V2V_EXAMPLE_1 
+                                    iface_macs = VM_MAC_ADDR_1_STATIC_IP_MAC_CONF_V2V_EXAMPLE_1
+                                - win2022:
+                                    main_vm = VM_NAME_ESX80_WIN2022_V2V_EXAMPLE
+                                    v2v_opts =  VM_NAME_WIN_1_STATIC_IP_MAC_CONF_V2V_EXAMPLE_2
+                                    iface_macs = VM_MAC_ADDR_1_STATIC_IP_MAC_CONF_V2V_EXAMPLE_2
                 - vmware_tools:
                     only esx_80
                     checkpoint = 'vmware_tools'