diff --git a/whitebox_neutron_tempest_plugin/tests/scenario/test_extra_dhcp_opts.py b/whitebox_neutron_tempest_plugin/tests/scenario/test_extra_dhcp_opts.py
index 6498761..0caff3a 100644
--- a/whitebox_neutron_tempest_plugin/tests/scenario/test_extra_dhcp_opts.py
+++ b/whitebox_neutron_tempest_plugin/tests/scenario/test_extra_dhcp_opts.py
@@ -241,11 +241,7 @@ class ExtraDhcpOptionsTest(base.BaseTempestTestCase):
         # ipv4.domain is expected
         vm_resolv_conf = vm_ssh_client.exec_command(
             "sudo dhclient && cat /etc/resolv.conf")
-        # (rsafrono) for some reason with devstack there is sometimes one more
-        # entry in the 'search' line, a char 'n' before the end of the line
-        # causing the test to fail. Changing the regex to be less stict
-        # in order to unblock the gates.
-        self.assertIsNotNone(re.search(r'^search\s+{}\s+'.format(domain_value),
+        self.assertIsNotNone(re.search(r'^search\s+{}$'.format(domain_value),
                                        vm_resolv_conf,
                                        re.MULTILINE))
 
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index fcd5032..8825458 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -184,6 +184,9 @@
           $NEUTRON_DHCP_CONF:
             agent:
               availability_zone: nova
+          $NOVA_CONF:
+            api:
+              dhcp_domain: ''
         test-config:
           $TEMPEST_CONFIG:
             neutron_plugin_options: