diff --git a/Tests/integration/FirewallAddress.Tests.ps1 b/Tests/integration/FirewallAddress.Tests.ps1
index a18bfb950..c7a6e3604 100644
--- a/Tests/integration/FirewallAddress.Tests.ps1
+++ b/Tests/integration/FirewallAddress.Tests.ps1
@@ -58,7 +58,9 @@ Describe "Get Firewall Address" {
         $address.q_path | Should -Be "firewall"
         $address.q_name | Should -Be "address"
         $address.q_mkey_type | Should -Be "string"
-        $address.q_no_edit | Should -Not -BeNullOrEmpty
+        if ($DefaultFGTConnection.version -ge "6.2.0") {
+            $address.q_no_edit | Should -Not -BeNullOrEmpty
+        }
         $address.q_class | Should -Not -BeNullOrEmpty
     }
 
diff --git a/Tests/integration/FirewallAddressGroup.Tests.ps1 b/Tests/integration/FirewallAddressGroup.Tests.ps1
index 6dd572f3e..11550d4db 100644
--- a/Tests/integration/FirewallAddressGroup.Tests.ps1
+++ b/Tests/integration/FirewallAddressGroup.Tests.ps1
@@ -60,7 +60,9 @@ Describe "Get Firewall Address Group" {
         $addressgroup.q_path | Should -Be "firewall"
         $addressgroup.q_name | Should -Be "addrgrp"
         $addressgroup.q_mkey_type | Should -Be "string"
-        $addressgroup.q_no_edit | Should -Not -BeNullOrEmpty
+        if ($DefaultFGTConnection.version -ge "6.2.0") {
+            $addressgroup.q_no_edit | Should -Not -BeNullOrEmpty
+        }
         $addressgroup.q_class | Should -Not -BeNullOrEmpty
     }
 
diff --git a/Tests/integration/FirewallPolicy.Tests.ps1 b/Tests/integration/FirewallPolicy.Tests.ps1
index 438f9af32..4415d66ae 100644
--- a/Tests/integration/FirewallPolicy.Tests.ps1
+++ b/Tests/integration/FirewallPolicy.Tests.ps1
@@ -57,7 +57,9 @@ Describe "Get Firewall Policy" {
         $policy.q_path | Should -Be "firewall"
         $policy.q_name | Should -Be "policy"
         $policy.q_mkey_type | Should -Be "integer"
-        $policy.q_no_edit | Should -Not -BeNullOrEmpty
+        if ($DefaultFGTConnection.version -ge "6.2.0") {
+            $policy.q_no_edit | Should -Not -BeNullOrEmpty
+        }
         #$policy.q_class | Should -Not -BeNullOrEmpty
     }
 
diff --git a/Tests/integration/FirewallProxyAddress.Tests.ps1 b/Tests/integration/FirewallProxyAddress.Tests.ps1
index 53206464d..3b547ed0e 100644
--- a/Tests/integration/FirewallProxyAddress.Tests.ps1
+++ b/Tests/integration/FirewallProxyAddress.Tests.ps1
@@ -58,7 +58,9 @@ Describe "Get Firewall Proxy Address" {
         $address.q_path | Should -Be "firewall"
         $address.q_name | Should -Be "proxy-address"
         $address.q_mkey_type | Should -Be "string"
-        $address.q_no_edit | Should -Not -BeNullOrEmpty
+        if ($DefaultFGTConnection.version -ge "6.2.0") {
+            $address.q_no_edit | Should -Not -BeNullOrEmpty
+        }
         $address.q_class | Should -Not -BeNullOrEmpty
     }
 
diff --git a/Tests/integration/FirewallProxyAddressGroup.Tests.ps1 b/Tests/integration/FirewallProxyAddressGroup.Tests.ps1
index bb41ab088..b7d6ac765 100644
--- a/Tests/integration/FirewallProxyAddressGroup.Tests.ps1
+++ b/Tests/integration/FirewallProxyAddressGroup.Tests.ps1
@@ -61,7 +61,9 @@ Describe "Get Firewall Proxy Address Group" {
         $addressgroup.q_path | Should -Be "firewall"
         $addressgroup.q_name | Should -Be "proxy-addrgrp"
         $addressgroup.q_mkey_type | Should -Be "string"
-        $addressgroup.q_no_edit | Should -Not -BeNullOrEmpty
+        if ($DefaultFGTConnection.version -ge "6.2.0") {
+            $addressgroup.q_no_edit | Should -Not -BeNullOrEmpty
+        }
         $addressgroup.q_class | Should -Not -BeNullOrEmpty
     }
 
diff --git a/Tests/integration/FirewallProxyPolicy.Tests.ps1 b/Tests/integration/FirewallProxyPolicy.Tests.ps1
index 639aedcb7..01da583b4 100644
--- a/Tests/integration/FirewallProxyPolicy.Tests.ps1
+++ b/Tests/integration/FirewallProxyPolicy.Tests.ps1
@@ -57,7 +57,9 @@ Describe "Get Firewall Proxy Policy" {
         $policy.q_path | Should -Be "firewall"
         $policy.q_name | Should -Be "proxy-policy"
         $policy.q_mkey_type | Should -Be "integer"
-        $policy.q_no_edit | Should -Not -BeNullOrEmpty
+        if ($DefaultFGTConnection.version -ge "6.2.0") {
+            $policy.q_no_edit | Should -Not -BeNullOrEmpty
+        }
         #$policy.q_class | Should -Not -BeNullOrEmpty
     }
 
diff --git a/Tests/integration/FirewallVip.Tests.ps1 b/Tests/integration/FirewallVip.Tests.ps1
index c1c5e419a..1a02e3db8 100644
--- a/Tests/integration/FirewallVip.Tests.ps1
+++ b/Tests/integration/FirewallVip.Tests.ps1
@@ -56,7 +56,9 @@ Describe "Get Firewall VIP" {
         $vip.q_path | Should -Be "firewall"
         $vip.q_name | Should -Be "vip"
         $vip.q_mkey_type | Should -Be "string"
-        $vip.q_no_edit | Should -Not -BeNullOrEmpty
+        if ($DefaultFGTConnection.version -ge "6.2.0") {
+            $vip.q_no_edit | Should -Not -BeNullOrEmpty
+        }
         $vip.q_class | Should -Not -BeNullOrEmpty
     }
 
diff --git a/Tests/integration/FirewallVipGroup.Tests.ps1 b/Tests/integration/FirewallVipGroup.Tests.ps1
index 04bb54555..b42853158 100644
--- a/Tests/integration/FirewallVipGroup.Tests.ps1
+++ b/Tests/integration/FirewallVipGroup.Tests.ps1
@@ -60,7 +60,9 @@ Describe "Get Firewall Vip Group" {
         $vipgroup.q_path | Should -Be "firewall"
         $vipgroup.q_name | Should -Be "vipgrp"
         $vipgroup.q_mkey_type | Should -Be "string"
-        $vipgroup.q_no_edit | Should -Not -BeNullOrEmpty
+        if ($DefaultFGTConnection.version -ge "6.2.0") {
+            $vipgroup.q_no_edit | Should -Not -BeNullOrEmpty
+        }
         $vipgroup.q_class | Should -Not -BeNullOrEmpty
     }
 
diff --git a/Tests/integration/RouterStatic.Tests.ps1 b/Tests/integration/RouterStatic.Tests.ps1
index 4fe009400..dd4ae3884 100644
--- a/Tests/integration/RouterStatic.Tests.ps1
+++ b/Tests/integration/RouterStatic.Tests.ps1
@@ -50,7 +50,9 @@ Describe "Get Static Route" {
         $route.q_path | Should -Be "router"
         $route.q_name | Should -Be "static"
         $route.q_mkey_type | Should -Be "integer"
-        $route.q_no_edit | Should -Not -BeNullOrEmpty
+        if ($DefaultFGTConnection.version -ge "6.2.0") {
+            $route.q_no_edit | Should -Not -BeNullOrEmpty
+        }
         #$route.q_class | Should -Not -BeNullOrEmpty
     }
 
diff --git a/Tests/integration/SystemInterface.Tests.ps1 b/Tests/integration/SystemInterface.Tests.ps1
index cf0e8b42c..29ff0bdde 100644
--- a/Tests/integration/SystemInterface.Tests.ps1
+++ b/Tests/integration/SystemInterface.Tests.ps1
@@ -54,7 +54,9 @@ Describe "Get System Interface" {
         $interface.q_path | Should -Be "system"
         $interface.q_name | Should -Be "interface"
         $interface.q_mkey_type | Should -Be "string"
-        $interface.q_no_edit | Should -Not -BeNullOrEmpty
+        if ($DefaultFGTConnection.version -ge "6.2.0") {
+            $interface.q_no_edit | Should -Not -BeNullOrEmpty
+        }
         #$interface.q_class | Should -Not -BeNullOrEmpty
     }
 
diff --git a/Tests/integration/SystemZone.Tests.ps1 b/Tests/integration/SystemZone.Tests.ps1
index 110c6456c..2fab5414a 100644
--- a/Tests/integration/SystemZone.Tests.ps1
+++ b/Tests/integration/SystemZone.Tests.ps1
@@ -50,7 +50,9 @@ Describe "Get zone" {
         $zone.q_path | Should -Be "system"
         $zone.q_name | Should -Be "zone"
         $zone.q_mkey_type | Should -Be "string"
-        $zone.q_no_edit | Should -Not -BeNullOrEmpty
+        if ($DefaultFGTConnection.version -ge "6.2.0") {
+            $zone.q_no_edit | Should -Not -BeNullOrEmpty
+        }
         #$zone.q_class | Should -Not -BeNullOrEmpty
     }
 
diff --git a/Tests/integration/VpnIPsecPhase1Interface.Tests.ps1 b/Tests/integration/VpnIPsecPhase1Interface.Tests.ps1
index 02951dfde..3f3df1582 100644
--- a/Tests/integration/VpnIPsecPhase1Interface.Tests.ps1
+++ b/Tests/integration/VpnIPsecPhase1Interface.Tests.ps1
@@ -55,7 +55,9 @@ Describe "Get VPN Ipsec Phase 1 Interface" {
         $interface.q_path | Should -Be "vpn.ipsec"
         $interface.q_name | Should -Be "phase1-interface"
         $interface.q_mkey_type | Should -Be "string"
-        $interface.q_no_edit | Should -Not -BeNullOrEmpty
+        if ($DefaultFGTConnection.version -ge "6.2.0") {
+            $interface.q_no_edit | Should -Not -BeNullOrEmpty
+        }
         #$interface.q_class | Should -Not -BeNullOrEmpty
     }
 
diff --git a/Tests/integration/VpnIPsecPhase2Interface.Tests.ps1 b/Tests/integration/VpnIPsecPhase2Interface.Tests.ps1
index 0feb75ab8..5de43a3a5 100644
--- a/Tests/integration/VpnIPsecPhase2Interface.Tests.ps1
+++ b/Tests/integration/VpnIPsecPhase2Interface.Tests.ps1
@@ -57,7 +57,9 @@ Describe "Get VPN Ipsec Phase 2 Interface" {
         $interface.q_path | Should -Be "vpn.ipsec"
         $interface.q_name | Should -Be "phase2-interface"
         $interface.q_mkey_type | Should -Be "string"
-        $interface.q_no_edit | Should -Not -BeNullOrEmpty
+        if ($DefaultFGTConnection.version -ge "6.2.0") {
+            $interface.q_no_edit | Should -Not -BeNullOrEmpty
+        }
         #$interface.q_class | Should -Not -BeNullOrEmpty
     }