diff --git a/tobiko/common/asserts.py b/tobiko/common/asserts.py
index eee5f7a89..3ca09eb24 100644
--- a/tobiko/common/asserts.py
+++ b/tobiko/common/asserts.py
@@ -24,8 +24,9 @@ class PingFailed(exceptions.TobikoException,
     message = "Failed pinging %(destination)r: %(reason)s"
 
 
-def assert_ping(ip, should_fail=False, mtu=None, fragmentation=True):
-    success = net_utils.ping_ip_address(ip, mtu=mtu,
+def assert_ping(ip, should_fail=False, fragmentation=True,
+                packet_size=None):
+    success = net_utils.ping_ip_address(ip, mtu=packet_size,
                                         fragmentation=fragmentation)
     if success:
         if should_fail:
diff --git a/tobiko/tests/scenario/neutron/base.py b/tobiko/tests/scenario/neutron/base.py
index 65ab54a21..df9c4c859 100644
--- a/tobiko/tests/scenario/neutron/base.py
+++ b/tobiko/tests/scenario/neutron/base.py
@@ -16,6 +16,7 @@ from __future__ import absolute_import
 
 import os
 
+import tobiko
 from tobiko import config
 from tobiko.openstack import heat
 from tobiko.tests import base
@@ -43,4 +44,8 @@ class SecurityGroupsFixture(heat.HeatStackFixture):
 
 
 class NeutronTest(base.TobikoTest):
-    pass
+
+    def setup_fixture(self, fixture_type):
+        stack = tobiko.setup_fixture(fixture_type)
+        stack.wait_for_outputs()
+        return stack
diff --git a/tobiko/tests/scenario/neutron/templates/internal_network.yaml b/tobiko/tests/scenario/neutron/templates/internal_network.yaml
index 03a87bea1..9db9aa7a9 100644
--- a/tobiko/tests/scenario/neutron/templates/internal_network.yaml
+++ b/tobiko/tests/scenario/neutron/templates/internal_network.yaml
@@ -14,12 +14,17 @@ parameters:
   dns_nameservers:
     type: comma_delimited_list
     default: ["8.8.8.8", "8.8.4.4"]
+  value_specs:
+    type: json
+    default: {}
 
 
 resources:
 
   network:
     type: OS::Neutron::Net
+    properties:
+      value_specs: {get_param: value_specs}
 
   subnet_ipv4:
     type: OS::Neutron::Subnet
@@ -45,3 +50,5 @@ resources:
 outputs:
   network_id:
     value: {get_resource: network}
+  mtu:
+    value: {get_attr: [network, mtu]}
diff --git a/tobiko/tests/scenario/neutron/test_floating_ip.py b/tobiko/tests/scenario/neutron/test_floating_ip.py
index e025d38da..5490f47f6 100644
--- a/tobiko/tests/scenario/neutron/test_floating_ip.py
+++ b/tobiko/tests/scenario/neutron/test_floating_ip.py
@@ -29,12 +29,17 @@ class FloatingIPFixture(heat.HeatStackFixture):
     parameters = {'floating_network': CONF.tobiko.neutron.floating_network,
                   'image': CONF.tobiko.nova.image,
                   'flavor': CONF.tobiko.nova.flavor}
+    internal_network_fixture = base.InternalNetworkFixture
+    internal_network = None
 
     def setup_parameters(self):
         super(FloatingIPFixture, self).setup_parameters()
-        internal_network = tobiko.setup_fixture(
-                base.InternalNetworkFixture).wait_for_outputs()
-        self.parameters['internal_network'] = internal_network.network_id
+        self.setup_internal_network()
+        self.parameters['internal_network'] = self.internal_network.network_id
+
+    def setup_internal_network(self):
+        self.internal_network = tobiko.setup_fixture(
+            self.internal_network_fixture).wait_for_outputs()
 
 
 class FloatingIPWithPortSecurityFixture(FloatingIPFixture):
@@ -43,34 +48,43 @@ class FloatingIPWithPortSecurityFixture(FloatingIPFixture):
 
 class FloatingIPWithSecurityGroupFixture(FloatingIPFixture):
     parameters = {'port_security_enabled': True}
+    security_groups_fixture = base.SecurityGroupsFixture
+    security_groups = None
 
     def setup_parameters(self):
         super(FloatingIPWithSecurityGroupFixture, self).setup_parameters()
-        security_groups = tobiko.setup_fixture(
-                base.SecurityGroupsFixture).wait_for_outputs()
+        self.setup_security_groups()
         self.parameters['security_groups'] = [
-            security_groups.icmp_security_group_id]
+            self.security_groups.icmp_security_group_id]
+
+    def setup_security_groups(self):
+        self.security_groups = tobiko.setup_fixture(
+                self.security_groups_fixture).wait_for_outputs()
 
 
 class FloatingIPTest(base.NeutronTest):
     """Tests server connectivity"""
 
-    def test_ping_floating_ip(self,
-                              fixture_type=FloatingIPFixture,
-                              should_fail=False):
+    def test_ping_floating_ip(self, fixture_type=FloatingIPFixture):
         """Validates connectivity to a server post upgrade."""
-        stack = tobiko.setup_fixture(fixture_type)
-        outputs = stack.wait_for_outputs()
-        asserts.assert_ping(outputs.floating_ip_address,
-                            should_fail=should_fail)
+        stack = self.setup_fixture(fixture_type)
+        asserts.assert_ping(stack.outputs.floating_ip_address)
 
-    def test_ping_floating_ip_with_port_security(self):
+    def test_ping_floating_ip_with_port_security(
+            self, fixture_type=FloatingIPWithPortSecurityFixture):
         """Validates connectivity to a server post upgrade."""
-        self.test_ping_floating_ip(
-            fixture_type=FloatingIPWithPortSecurityFixture,
-            should_fail=True)
+        stack = self.setup_fixture(fixture_type)
+        asserts.assert_ping(stack.outputs.floating_ip_address,
+                            should_fail=True)
 
-    def test_ping_floating_ip_security_group(self):
+    def test_ping_floating_ip_with_security_group(
+            self, fixture_type=FloatingIPWithSecurityGroupFixture):
         """Validates connectivity to a server post upgrade."""
-        self.test_ping_floating_ip(
-            fixture_type=FloatingIPWithSecurityGroupFixture)
+        stack = self.setup_fixture(fixture_type)
+        asserts.assert_ping(stack.outputs.floating_ip_address)
+
+    def test_ping_with_oversize_packet(self, fixture_type=FloatingIPFixture):
+        stack = self.setup_fixture(fixture_type)
+        asserts.assert_ping(stack.outputs.floating_ip_address,
+                            packet_size=stack.internal_network.mtu + 1,
+                            fragmentation=False, should_fail=True)