diff --git a/tests/vcloud_director/requests/compute/edge_gateway_tests.rb b/tests/vcloud_director/requests/compute/edge_gateway_tests.rb
index f45584e05..d0ba4d873 100644
--- a/tests/vcloud_director/requests/compute/edge_gateway_tests.rb
+++ b/tests/vcloud_director/requests/compute/edge_gateway_tests.rb
@@ -43,6 +43,8 @@ Shindo.tests('Compute::VcloudDirector | edge gateway requests', ['vclouddirector
 
 
   tests('Retrieve non-existent edge gateway').raises(Excon::Errors::Forbidden) do
+    pending if Fog.mocking?
+
     @service.get_edge_gateway('00000000-0000-0000-0000-000000000000')
   end
 
diff --git a/tests/vcloud_director/requests/compute/schema_helper.rb b/tests/vcloud_director/requests/compute/schema_helper.rb
index fa30c33fe..ce6fbfa12 100644
--- a/tests/vcloud_director/requests/compute/schema_helper.rb
+++ b/tests/vcloud_director/requests/compute/schema_helper.rb
@@ -316,7 +316,7 @@ class VcloudDirector
         :IsEnabled => String,
         :DefaultAction => String,
         :LogDefaultAction => String,
-        :FirewallRule	=> [FIREWALL_RULE_TYPE]
+        #:FirewallRule	=> [FIREWALL_RULE_TYPE]  # not required
       }
 
       #Represents the SNAT and DNAT rules.
@@ -344,7 +344,7 @@ class VcloudDirector
         :IsEnabled => String,
         :NatType => Fog::Nullable::String,
         :Policy => Fog::Nullable::String,
-        :NatRule => [NAT_RULE_TYPE],
+        #:NatRule => [NAT_RULE_TYPE],  # not required
         :ExternalIp => Fog::Nullable::String
       }