diff --git a/stack/erp5/buildout.cfg b/stack/erp5/buildout.cfg
index 373851bc69a8aeb8bd4bceb271498e165204b9df..7685f9f1bef0a0851ececbd707c73486c034e5c5 100644
--- a/stack/erp5/buildout.cfg
+++ b/stack/erp5/buildout.cfg
@@ -284,7 +284,7 @@ md5sum = 4d2207931975e580d04d0b0506034564
 [template-zope]
 < = download-base
 filename = instance-zope.cfg.in
-md5sum = f1245467092b4457f4363f9b7bc65e98
+md5sum = a3d1f6298d132426a9752935bb91d4af
 link-binary =
   ${coreutils:location}/bin/basename
   ${coreutils:location}/bin/cat
diff --git a/stack/erp5/instance-zope.cfg.in b/stack/erp5/instance-zope.cfg.in
index 772bc8246034fc0a7afcedeb83e20a9d09b5b731..f5cffbc5869e455b768fb3be615937339bc2a647 100644
--- a/stack/erp5/instance-zope.cfg.in
+++ b/stack/erp5/instance-zope.cfg.in
@@ -15,7 +15,8 @@ partition. No more (undefined result), no less (IndexError).
 -#}
 {% set ipv4 = (ipv4_set | list)[0] -%}
 
-[test-runner]
+{% if slapparameter_dict['mysql-test-url-list'] -%}
+[{{ section('test-runner') }}]
 recipe = slapos.cookbook:erp5.test
 certificate-authority-path = ${test-certificate-authority:ca-dir}
 mysql-url-list = {{ dumps(slapparameter_dict['mysql-test-url-list']) }}
@@ -40,6 +41,7 @@ ca-private = ${directory:ca-private}
 ca-certs = ${directory:ca-certs}
 ca-newcerts = ${directory:ca-newcerts}
 ca-crl = ${directory:ca-crl}
+{%- endif %}
 
 [directory]
 recipe = slapos.cookbook:mkdirectory
@@ -300,7 +302,6 @@ develop-eggs-directory = {{ develop_eggs_directory }}
 extends =
   {{ parameter_dict['instance-logrotate-cfg'] }}
 parts +=
-  test-runner
   erp5-promise
   {{ part_list | join('\n  ') }}
   publish-zope