diff --git a/testing/pluto/xauth-pluto-22/east.conf b/testing/pluto/xauth-pluto-22/east.conf
index 60f7cb2a2..66f8e025e 100644
--- a/testing/pluto/xauth-pluto-22/east.conf
+++ b/testing/pluto/xauth-pluto-22/east.conf
@@ -30,8 +30,8 @@ conn east-any
 
 conn east
 	left=%any
-	leftaddresspool=192.0.2.100-192.0.2.200
-	xauthby=alwaysok
+	leftaddresspool=192.0.2.101-192.0.2.200
+	xauthby=file
 
 conn xauth-base
 	rightxauthserver=yes
diff --git a/testing/pluto/xauth-pluto-22/eastinit.sh b/testing/pluto/xauth-pluto-22/eastinit.sh
index 0d612ab11..98a019f6c 100755
--- a/testing/pluto/xauth-pluto-22/eastinit.sh
+++ b/testing/pluto/xauth-pluto-22/eastinit.sh
@@ -1,4 +1,6 @@
 /testing/guestbin/swan-prep
+echo "use4:xOzlFlqtwJIu2:east-any" >> /etc/ipsec.d/passwd
+echo "use5:xOzlFlqtwJIu2:east-any:192.0.2.100" >> /etc/ipsec.d/passwd
 ipsec start
 /testing/pluto/bin/wait-until-pluto-started
 ipsec auto --add east-any
diff --git a/testing/pluto/xauth-pluto-22/northinit.sh b/testing/pluto/xauth-pluto-22/northinit.sh
index 2b19a0eaa..4e90e22f3 100755
--- a/testing/pluto/xauth-pluto-22/northinit.sh
+++ b/testing/pluto/xauth-pluto-22/northinit.sh
@@ -3,7 +3,7 @@ ipsec start
 /testing/pluto/bin/wait-until-pluto-started
 ../bin/block-non-ipsec.sh
 ipsec auto --add north-east
-ipsec whack --xauthname 'use3' --xauthpass 'use1pass' --name north-east --initiate
+ipsec whack --xauthname 'use4' --xauthpass 'use1pass' --name north-east --initiate
 ping -n -c 4 -w 4 -I 192.0.2.100 192.0.2.254
 ipsec whack --trafficstatus
 echo initdone
diff --git a/testing/pluto/xauth-pluto-22/roadrun.sh b/testing/pluto/xauth-pluto-22/roadrun.sh
index c53c5f9e8..e5a49f71f 100755
--- a/testing/pluto/xauth-pluto-22/roadrun.sh
+++ b/testing/pluto/xauth-pluto-22/roadrun.sh
@@ -1,4 +1,4 @@
-ipsec whack --xauthname 'use3' --xauthpass 'use1pass' --name road-east --initiate
+ipsec whack --xauthname 'use5' --xauthpass 'use1pass' --name road-east --initiate
 ping -n -c 4 192.0.2.254
 ipsec whack --trafficstatus
 echo done