diff --git a/neutron/tests/fullstack/test_connectivity.py b/neutron/tests/fullstack/test_connectivity.py
index 2cf8fa94df1..1d6bd53f8e4 100644
--- a/neutron/tests/fullstack/test_connectivity.py
+++ b/neutron/tests/fullstack/test_connectivity.py
@@ -41,6 +41,7 @@ class BaseConnectivitySameNetworkTest(base.BaseFullStackTestCase):
     of_interface = None
     ovsdb_interface = None
     arp_responder = False
+    use_dhcp = True
 
     num_hosts = 3
 
@@ -53,7 +54,9 @@ class BaseConnectivitySameNetworkTest(base.BaseFullStackTestCase):
                 l3_agent=self.l2_pop,
                 of_interface=self.of_interface,
                 ovsdb_interface=self.ovsdb_interface,
-                l2_agent_type=self.l2_agent_type)
+                l2_agent_type=self.l2_agent_type,
+                dhcp_agent=self.use_dhcp,
+            )
             for _ in range(self.num_hosts)]
         env = environment.Environment(
             environment.EnvironmentDescription(
@@ -72,7 +75,8 @@ class BaseConnectivitySameNetworkTest(base.BaseFullStackTestCase):
 
         network = self.safe_client.create_network(tenant_uuid, **net_args)
         self.safe_client.create_subnet(
-            tenant_uuid, network['id'], '20.0.0.0/24')
+            tenant_uuid, network['id'], '20.0.0.0/24',
+            enable_dhcp=self.use_dhcp)
 
         return network
 
@@ -83,7 +87,8 @@ class BaseConnectivitySameNetworkTest(base.BaseFullStackTestCase):
                     host,
                     network['id'],
                     tenant_uuid,
-                    self.safe_client))
+                    self.safe_client,
+                    use_dhcp=self.use_dhcp))
             for host in self.environment.hosts)
 
         vms.block_until_all_boot()
@@ -117,6 +122,18 @@ class TestOvsConnectivitySameNetwork(BaseConnectivitySameNetworkTest):
         self._test_connectivity()
 
 
+class TestOvsConnectivitySameNetworkNoDhcp(BaseConnectivitySameNetworkTest):
+    use_dhcp = False
+    network_type = 'vxlan'
+    l2_pop = False
+    l2_agent_type = constants.AGENT_TYPE_OVS
+    ovsdb_interface = 'native'
+    of_interface = 'native'
+
+    def test_connectivity(self):
+        self._test_connectivity()
+
+
 class TestOvsConnectivitySameNetworkOnOvsBridgeControllerStop(
         BaseConnectivitySameNetworkTest):
 
diff --git a/neutron/tests/fullstack/test_l3_agent.py b/neutron/tests/fullstack/test_l3_agent.py
index 5c07dc5ef03..a1d1b4de8db 100644
--- a/neutron/tests/fullstack/test_l3_agent.py
+++ b/neutron/tests/fullstack/test_l3_agent.py
@@ -17,7 +17,6 @@ import netaddr
 import os
 import time
 
-from neutron_lib import constants
 from oslo_utils import uuidutils
 
 from neutron.agent.l3 import ha_router
@@ -42,9 +41,7 @@ class TestL3Agent(base.BaseFullStackTestCase):
         cidr = self.useFixture(
             ip_network.ExclusiveIPNetwork(
                 "240.0.0.0", "240.255.255.255", "24")).network
-        subnet = self.safe_client.create_subnet(
-            tenant_id, network['id'], cidr,
-            enable_dhcp=False)
+        subnet = self.safe_client.create_subnet(tenant_id, network['id'], cidr)
         return network, subnet
 
     def block_until_port_status_active(self, port_id):
@@ -55,11 +52,8 @@ class TestL3Agent(base.BaseFullStackTestCase):
 
     def _create_and_attach_subnet(
             self, tenant_id, subnet_cidr, network_id, router_id):
-        # For IPv6 subnets, enable_dhcp should be set to true.
-        enable_dhcp = (netaddr.IPNetwork(subnet_cidr).version ==
-            constants.IP_VERSION_6)
         subnet = self.safe_client.create_subnet(
-            tenant_id, network_id, subnet_cidr, enable_dhcp=enable_dhcp)
+            tenant_id, network_id, subnet_cidr)
 
         router_interface_info = self.safe_client.add_router_interface(
             router_id, subnet['id'])
@@ -69,7 +63,7 @@ class TestL3Agent(base.BaseFullStackTestCase):
     def _boot_fake_vm_in_network(self, host, tenant_id, network_id, wait=True):
         vm = self.useFixture(
             machine.FakeFullstackMachine(
-                host, network_id, tenant_id, self.safe_client))
+                host, network_id, tenant_id, self.safe_client, use_dhcp=True))
         if wait:
             vm.block_until_boot()
         return vm
@@ -87,7 +81,7 @@ class TestLegacyL3Agent(TestL3Agent):
 
     def setUp(self):
         host_descriptions = [
-            environment.HostDescription(l3_agent=True),
+            environment.HostDescription(l3_agent=True, dhcp_agent=True),
             environment.HostDescription()]
         env = environment.Environment(
             environment.EnvironmentDescription(
@@ -191,7 +185,8 @@ class TestHAL3Agent(TestL3Agent):
 
     def setUp(self):
         host_descriptions = [
-            environment.HostDescription(l3_agent=True) for _ in range(2)]
+            environment.HostDescription(l3_agent=True, dhcp_agent=True)
+            for _ in range(2)]
         env = environment.Environment(
             environment.EnvironmentDescription(
                 network_type='vxlan', l2_pop=True),
diff --git a/neutron/tests/fullstack/test_securitygroup.py b/neutron/tests/fullstack/test_securitygroup.py
index 7009bb4d7d3..a18754f2606 100644
--- a/neutron/tests/fullstack/test_securitygroup.py
+++ b/neutron/tests/fullstack/test_securitygroup.py
@@ -52,7 +52,8 @@ class BaseSecurityGroupsSameNetworkTest(base.BaseFullStackTestCase):
                 of_interface=self.of_interface,
                 ovsdb_interface=self.ovsdb_interface,
                 l2_agent_type=self.l2_agent_type,
-                firewall_driver=self.firewall_driver) for _ in range(2)]
+                firewall_driver=self.firewall_driver,
+                dhcp_agent=True) for _ in range(2)]
         env = environment.Environment(
             environment.EnvironmentDescription(
                 network_type=self.network_type),
@@ -147,7 +148,8 @@ class TestSecurityGroupsSameNetwork(BaseSecurityGroupsSameNetworkTest):
                     network['id'],
                     tenant_uuid,
                     self.safe_client,
-                    neutron_port=ports[port]))
+                    neutron_port=ports[port],
+                    use_dhcp=True))
             for port, host in enumerate(index_to_host)]
 
         for vm in vms:
@@ -238,7 +240,8 @@ class TestSecurityGroupsSameNetwork(BaseSecurityGroupsSameNetworkTest):
                     network['id'],
                     tenant_uuid,
                     self.safe_client,
-                    neutron_port=ports[3])))
+                    neutron_port=ports[3],
+                    use_dhcp=True)))
 
         vms[3].block_until_boot()