diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index a44ad320074..fe6527c6678 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -2052,6 +2052,7 @@ sub provision_chgdcpass($$)
 	my $extra_smb_conf = "
 	check password script = sed -e '/$unacceptable_password/{;q1}; /$unacceptable_password/!{q0}'
 	allow dcerpc auth level connect:lsarpc = yes
+	dcesrv:max auth states = 8
 ";
 	my $extra_provision_options = ["--use-ntvfs"];
 	push (@{$extra_provision_options}, "--dns-backend=BIND9_DLZ");
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 32887066161..a1f38424af7 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -703,7 +703,9 @@ planoldpythontestsuite(
 
 planoldpythontestsuite("ad_dc_ntvfs", "samba.tests.dcerpc.dnsserver", extra_args=['-U"$USERNAME%$PASSWORD"'], py3_compatible=True)
 planoldpythontestsuite("ad_dc", "samba.tests.dcerpc.dnsserver", extra_args=['-U"$USERNAME%$PASSWORD"'], py3_compatible=True)
-planoldpythontestsuite("chgdcpass", "samba.tests.dcerpc.raw_protocol", extra_args=['-U"$USERNAME%$PASSWORD"'], py3_compatible=True)
+planoldpythontestsuite("chgdcpass", "samba.tests.dcerpc.raw_protocol", py3_compatible=True,
+                       environ={'MAX_NUM_AUTH': '8'})
+
 if have_heimdal_support:
     planoldpythontestsuite("ad_dc:local", "samba.tests.auth_log", extra_args=['-U"$USERNAME%$PASSWORD"'],
                            environ={'CLIENT_IP': '127.0.0.11',