diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 218f83ba14d..78627c8eb66 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -639,8 +639,8 @@ sub write_clientconf($$$)
 	print CF "
 	private dir = $clientdir/private
 	lock dir = $clientdir/lockdir
-	state dir = $clientdir/statedir
-	cache dir = $clientdir/cachedir
+	state directory = $clientdir/statedir
+	cache directory = $clientdir/cachedir
 	ncalrpc dir = $clientdir/ncalrpcdir
 	name resolve order = file bcast
 	panic action = $RealBin/gdb_backtrace \%d
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 47f1bad3360..a1d894d64f3 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -597,8 +597,8 @@ sub provision_raw_step1($$)
 	pid directory = $ctx->{piddir}
 	ncalrpc dir = $ctx->{ncalrpcdir}
 	lock dir = $ctx->{lockdir}
-	state dir = $ctx->{statedir}
-	cache dir = $ctx->{cachedir}
+	state directory = $ctx->{statedir}
+	cache directory = $ctx->{cachedir}
 	winbindd socket directory = $ctx->{winbindd_socket_dir}
 	winbindd privileged socket directory = $ctx->{winbindd_privileged_socket_dir}
 	ntp signd socket directory = $ctx->{ntp_signd_socket_dir}