Check X server display number correctly used in tests, update some tests

42 files changed, 245 insertions, 301 deletions

diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf
index 9d6e432d..698093ab 100644
--- a/tests/scripts/autologin-logout.conf
+++ b/tests/scripts/autologin-logout.conf
@@ -3,7 +3,6 @@ seats=test-seat
 
 [test-seat]
 default-user=alice
-display-number=99
 
 [test-session-config]
 logout=true
diff --git a/tests/scripts/autologin-logout.script b/tests/scripts/autologin-logout.script
index 65d41367..8bb29457 100644
--- a/tests/scripts/autologin-logout.script
+++ b/tests/scripts/autologin-logout.script
@@ -5,27 +5,27 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Autologin session starts
 SESSION START USER=alice
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # Logout
 SESSION LOGOUT
 
 # X server resets
-XSERVER :.* DISCONNECT-CLIENTS
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 DISCONNECT-CLIENTS
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -35,6 +35,6 @@ GREETER CONNECTED-TO-DAEMON
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/autologin-xserver-crash.conf b/tests/scripts/autologin-xserver-crash.conf
index 8fc53f17..aa49c563 100644
--- a/tests/scripts/autologin-xserver-crash.conf
+++ b/tests/scripts/autologin-xserver-crash.conf
@@ -3,7 +3,6 @@ seats=test-seat
 
 [test-seat]
 default-user=alice
-display-number=99
 
 [test-session-config]
 crash-xserver=true
diff --git a/tests/scripts/autologin-xserver-crash.script b/tests/scripts/autologin-xserver-crash.script
index 82b147df..69c4f8fc 100644
--- a/tests/scripts/autologin-xserver-crash.script
+++ b/tests/scripts/autologin-xserver-crash.script
@@ -5,35 +5,35 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Default session starts
 SESSION START USER=alice
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # X server crashes (triggered by user session)
 SESSION CRASH-XSERVER
-XSERVER :.* CRASH
+XSERVER :50 CRASH
 
 # Session terminates
 SESSION TERMINATE SIGNAL=15
 
 # X server restarts and loads greeter
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/autologin.conf b/tests/scripts/autologin.conf
index 5349581a..c17c3f32 100644
--- a/tests/scripts/autologin.conf
+++ b/tests/scripts/autologin.conf
@@ -3,4 +3,3 @@ seats=test-seat
 
 [test-seat]
 default-user=alice
-display-number=99
diff --git a/tests/scripts/autologin.script b/tests/scripts/autologin.script
index 7e93061d..8a024e6e 100644
--- a/tests/scripts/autologin.script
+++ b/tests/scripts/autologin.script
@@ -5,18 +5,18 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Default session starts
 SESSION START USER=alice
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/greeter-xserver-crash.conf b/tests/scripts/greeter-xserver-crash.conf
index 28f1b5e8..7eea66a0 100644
--- a/tests/scripts/greeter-xserver-crash.conf
+++ b/tests/scripts/greeter-xserver-crash.conf
@@ -1,8 +1,5 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [test-greeter-config]
 crash-xserver=true
diff --git a/tests/scripts/greeter-xserver-crash.script b/tests/scripts/greeter-xserver-crash.script
index f8980e6e..26cfe628 100644
--- a/tests/scripts/greeter-xserver-crash.script
+++ b/tests/scripts/greeter-xserver-crash.script
@@ -5,34 +5,34 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
 # X server crashes (triggered by user session)
 GREETER CRASH-XSERVER
-XSERVER :.* CRASH
+XSERVER :50 CRASH
 
 # X server restarts and loads greeter
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/login-gobject-guest-disabled.conf b/tests/scripts/login-gobject-guest-disabled.conf
index f8d41221..f09a8c48 100644
--- a/tests/scripts/login-gobject-guest-disabled.conf
+++ b/tests/scripts/login-gobject-guest-disabled.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [GuestAccount]
 enabled=false
 
diff --git a/tests/scripts/login-gobject-guest-disabled.script b/tests/scripts/login-gobject-guest-disabled.script
index 0a23c118..42d766c4 100644
--- a/tests/scripts/login-gobject-guest-disabled.script
+++ b/tests/scripts/login-gobject-guest-disabled.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -23,6 +23,6 @@ GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/login-gobject-guest-fail-setup-script.conf b/tests/scripts/login-gobject-guest-fail-setup-script.conf
index ce2a5e05..51c88208 100644
--- a/tests/scripts/login-gobject-guest-fail-setup-script.conf
+++ b/tests/scripts/login-gobject-guest-fail-setup-script.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [GuestAccount]
 enabled=true
 
diff --git a/tests/scripts/login-gobject-guest-fail-setup-script.script b/tests/scripts/login-gobject-guest-fail-setup-script.script
index 9a75a855..3bc9624f 100644
--- a/tests/scripts/login-gobject-guest-fail-setup-script.script
+++ b/tests/scripts/login-gobject-guest-fail-setup-script.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -23,6 +23,6 @@ GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/login-gobject-guest-no-config.conf b/tests/scripts/login-gobject-guest-no-config.conf
index 7558978c..50fc6fb5 100644
--- a/tests/scripts/login-gobject-guest-no-config.conf
+++ b/tests/scripts/login-gobject-guest-no-config.conf
@@ -1,8 +1,5 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [test-greeter-config]
 login-guest=true
diff --git a/tests/scripts/login-gobject-guest-no-config.script b/tests/scripts/login-gobject-guest-no-config.script
index a1c6fc19..e2e0b250 100644
--- a/tests/scripts/login-gobject-guest-no-config.script
+++ b/tests/scripts/login-gobject-guest-no-config.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -23,6 +23,6 @@ GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/login-gobject-guest-no-setup-script.conf b/tests/scripts/login-gobject-guest-no-setup-script.conf
index ce2a5e05..51c88208 100644
--- a/tests/scripts/login-gobject-guest-no-setup-script.conf
+++ b/tests/scripts/login-gobject-guest-no-setup-script.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [GuestAccount]
 enabled=true
 
diff --git a/tests/scripts/login-gobject-guest-no-setup-script.script b/tests/scripts/login-gobject-guest-no-setup-script.script
index 3d86725e..3847a1ea 100644
--- a/tests/scripts/login-gobject-guest-no-setup-script.script
+++ b/tests/scripts/login-gobject-guest-no-setup-script.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -23,6 +23,6 @@ GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/login-gobject-guest.conf b/tests/scripts/login-gobject-guest.conf
index ec7a395d..15dad7af 100644
--- a/tests/scripts/login-gobject-guest.conf
+++ b/tests/scripts/login-gobject-guest.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [GuestAccount]
 enabled=true
 setup-script=test-setup-guest
diff --git a/tests/scripts/login-gobject-guest.script b/tests/scripts/login-gobject-guest.script
index 4f20161c..c687182a 100644
--- a/tests/scripts/login-gobject-guest.script
+++ b/tests/scripts/login-gobject-guest.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -20,15 +20,15 @@ GREETER CONNECTED-TO-DAEMON
 GREETER LOGIN-GUEST
 GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
 
-# Greeter quits, session starts
+# Greeter quits, guest session starts
 GREETER QUIT
 SESSION START USER=guest
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/login-gobject-invalid-user.conf b/tests/scripts/login-gobject-invalid-user.conf
index ec50fab7..498627f7 100644
--- a/tests/scripts/login-gobject-invalid-user.conf
+++ b/tests/scripts/login-gobject-invalid-user.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [test-greeter-config]
 username=notauser
 password=password
diff --git a/tests/scripts/login-gobject-invalid-user.script b/tests/scripts/login-gobject-invalid-user.script
index a61aeafc..6dded5bf 100644
--- a/tests/scripts/login-gobject-invalid-user.script
+++ b/tests/scripts/login-gobject-invalid-user.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -25,6 +25,6 @@ GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/login-gobject-logout.conf b/tests/scripts/login-gobject-logout.conf
index 1e66232c..58aa488a 100644
--- a/tests/scripts/login-gobject-logout.conf
+++ b/tests/scripts/login-gobject-logout.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [test-session-config]
 logout=true
 
diff --git a/tests/scripts/login-gobject-logout.script b/tests/scripts/login-gobject-logout.script
index 0178660a..e6ee5c75 100644
--- a/tests/scripts/login-gobject-logout.script
+++ b/tests/scripts/login-gobject-logout.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -25,27 +25,27 @@ GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
 # Greeter quits, session starts
 GREETER QUIT
 SESSION START USER=alice
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # Logout of session
 SESSION LOGOUT
 
 # X server resets
-XSERVER :.* DISCONNECT-CLIENTS
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 DISCONNECT-CLIENTS
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/login-gobject-manual.conf b/tests/scripts/login-gobject-manual.conf
index 1ff7512d..c345967d 100644
--- a/tests/scripts/login-gobject-manual.conf
+++ b/tests/scripts/login-gobject-manual.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [test-greeter-config]
 prompt-username=true
 username=alice
diff --git a/tests/scripts/login-gobject-manual.script b/tests/scripts/login-gobject-manual.script
index 3c34dbdd..8b32e526 100644
--- a/tests/scripts/login-gobject-manual.script
+++ b/tests/scripts/login-gobject-manual.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -27,12 +27,12 @@ GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
 # Greeter quits and session starts
 GREETER QUIT
 SESSION START USER=alice
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/login-gobject-no-password.conf b/tests/scripts/login-gobject-no-password.conf
index f0032c5a..bb442c44 100644
--- a/tests/scripts/login-gobject-no-password.conf
+++ b/tests/scripts/login-gobject-no-password.conf
@@ -1,8 +1,5 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [test-greeter-config]
 username=bob
diff --git a/tests/scripts/login-gobject-no-password.script b/tests/scripts/login-gobject-no-password.script
index 83584b52..e3efdfb3 100644
--- a/tests/scripts/login-gobject-no-password.script
+++ b/tests/scripts/login-gobject-no-password.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -23,12 +23,12 @@ GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
 # Session starts
 GREETER QUIT
 SESSION START USER=bob
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/login-gobject-session-crash.conf b/tests/scripts/login-gobject-session-crash.conf
index 512a6fe4..690b8b2e 100644
--- a/tests/scripts/login-gobject-session-crash.conf
+++ b/tests/scripts/login-gobject-session-crash.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [test-session-config]
 sigsegv=true
 
diff --git a/tests/scripts/login-gobject-session-crash.script b/tests/scripts/login-gobject-session-crash.script
index 9be7c04a..669ce1cf 100644
--- a/tests/scripts/login-gobject-session-crash.script
+++ b/tests/scripts/login-gobject-session-crash.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -25,27 +25,27 @@ GREETER QUIT
 
 # Session starts
 SESSION START USER=alice
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # Session crashes
 SESSION CRASH
 
 # X server resets
-XSERVER :.* DISCONNECT-CLIENTS
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 DISCONNECT-CLIENTS
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts on X server
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/login-gobject-wrong-password.conf b/tests/scripts/login-gobject-wrong-password.conf
index 8f27ad26..5778c93c 100644
--- a/tests/scripts/login-gobject-wrong-password.conf
+++ b/tests/scripts/login-gobject-wrong-password.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [test-greeter-config]
 username=alice
 password=rubbish
diff --git a/tests/scripts/login-gobject-wrong-password.script b/tests/scripts/login-gobject-wrong-password.script
index 638d5f08..83f68d8e 100644
--- a/tests/scripts/login-gobject-wrong-password.script
+++ b/tests/scripts/login-gobject-wrong-password.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -25,7 +25,7 @@ GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=FALSE
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
 
diff --git a/tests/scripts/login-gobject-xserver-crash.conf b/tests/scripts/login-gobject-xserver-crash.conf
index 3b7286e4..1e9fcc92 100644
--- a/tests/scripts/login-gobject-xserver-crash.conf
+++ b/tests/scripts/login-gobject-xserver-crash.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [test-session-config]
 crash-xserver=true
 
diff --git a/tests/scripts/login-gobject-xserver-crash.script b/tests/scripts/login-gobject-xserver-crash.script
index 2fded207..4577fbd3 100644
--- a/tests/scripts/login-gobject-xserver-crash.script
+++ b/tests/scripts/login-gobject-xserver-crash.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # XServer starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -25,28 +25,28 @@ GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
 # Greeter quits, and session starts
 GREETER QUIT
 SESSION START USER=alice
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # X server crashes (triggered by user session)
 SESSION CRASH-XSERVER
-XSERVER :.* CRASH
+XSERVER :50 CRASH
 
 # User session is terminated
 SESSION TERMINATE SIGNAL=15
 
 # X server restarts and loads greeter
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
 *STOP-DAEMON
 # Don't know what order they will terminate
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/login-gobject.conf b/tests/scripts/login-gobject.conf
index 5d207246..e232614d 100644
--- a/tests/scripts/login-gobject.conf
+++ b/tests/scripts/login-gobject.conf
@@ -1,9 +1,6 @@
 [LightDM]
 seats=test-seat
 
-[test-seat]
-display-number=99
-
 [test-greeter-config]
 username=alice
 password=password
diff --git a/tests/scripts/login-gobject.script b/tests/scripts/login-gobject.script
index 53f23c88..dde89ca9 100644
--- a/tests/scripts/login-gobject.script
+++ b/tests/scripts/login-gobject.script
@@ -5,14 +5,14 @@
 RUNNER DAEMON-START
 
 # X server starts
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
@@ -25,12 +25,12 @@ GREETER QUIT
 
 # Session starts
 SESSION START USER=alice
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 ACCEPT-CONNECT
 SESSION CONNECT-XSERVER
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/no-config.script b/tests/scripts/no-config.script
index 3ca9cf4a..5cb21e3c 100644
--- a/tests/scripts/no-config.script
+++ b/tests/scripts/no-config.script
@@ -5,21 +5,21 @@
 RUNNER DAEMON-START
 
 # One X server should start by default
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
 # A greeter should run on the X server
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
 
diff --git a/tests/scripts/show-greeter.conf b/tests/scripts/show-greeter.conf
index dedc788b..e232614d 100644
--- a/tests/scripts/show-greeter.conf
+++ b/tests/scripts/show-greeter.conf
@@ -1 +1,6 @@
 [LightDM]
+seats=test-seat
+
+[test-greeter-config]
+username=alice
+password=password
diff --git a/tests/scripts/show-greeter.script b/tests/scripts/show-greeter.script
index d0312668..986e9425 100644
--- a/tests/scripts/show-greeter.script
+++ b/tests/scripts/show-greeter.script
@@ -3,28 +3,52 @@
 #
 
 RUNNER DAEMON-START
-*WAIT
 
-# Show a greeter
-*SHOW-GREETER
-RUNNER SHOW-GREETER
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+# X server starts
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
+
+# Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
-# Show the greeter again, should not do anything
+# Login
+GREETER LOGIN USERNAME=alice
+GREETER SHOW-PROMPT TEXT="Password:"
+GREETER RESPOND TEXT="password"
+GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
+GREETER QUIT
+
+# Session starts
+SESSION START USER=alice
+XSERVER :50 ACCEPT-CONNECT
+SESSION CONNECT-XSERVER
+
+# Show the greeter
 *SHOW-GREETER
 RUNNER SHOW-GREETER
-*WAIT
+
+# New X server starts
+XSERVER :51 START
+XSERVER :51 INDICATE-READY
+XSERVER :51 ACCEPT-CONNECT
+
+# Greeter starts
+GREETER START
+XSERVER :51 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :51
+GREETER CONNECT-TO-DAEMON
+GREETER CONNECTED-TO-DAEMON
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|XSERVER :51 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/switch-to-guest.conf b/tests/scripts/switch-to-guest.conf
index 0fe0d257..c52fc7ce 100644
--- a/tests/scripts/switch-to-guest.conf
+++ b/tests/scripts/switch-to-guest.conf
@@ -1,9 +1,7 @@
 [LightDM]
+seats=test-seat
 
 [GuestAccount]
 enabled=true
 setup-script=test-setup-guest
 cleanup-script=test-cleanup-guest
-
-[test-greeter-config]
-login-guest=true
diff --git a/tests/scripts/switch-to-guest.script b/tests/scripts/switch-to-guest.script
index f0cb576e..c7db3949 100644
--- a/tests/scripts/switch-to-guest.script
+++ b/tests/scripts/switch-to-guest.script
@@ -5,45 +5,40 @@
 RUNNER DAEMON-START
 *WAIT
 
-# Switch to guest, should automatically log in
-*SWITCH-TO-GUEST
-RUNNER SWITCH-TO-GUEST
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
-SESSION START USER=guest
-XSERVER :.* ACCEPT-CONNECT
-SESSION CONNECT-XSERVER
-
-# Switch again, should not do anything as guest already running
-*SWITCH-TO-GUEST
-RUNNER SWITCH-TO-GUEST
-*WAIT
+# X server starts
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
 
-# Show a new greeter
-*SHOW-GREETER
-RUNNER SHOW-GREETER
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+# Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
-# Log in as guest
+# Switch to guest
+*SWITCH-TO-GUEST
+RUNNER SWITCH-TO-GUEST
+
+# Existing greeter does the action
 GREETER LOGIN-GUEST
 GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
 
-# New display should quit, and first session should be actived
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+# Greeter quits, guest session starts
+GREETER QUIT
+SESSION START USER=guest
+XSERVER :50 ACCEPT-CONNECT
+SESSION CONNECT-XSERVER
+
+# Switch again, should not do anything as guest already running
+*SWITCH-TO-GUEST
+RUNNER SWITCH-TO-GUEST
 *WAIT
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(SESSION TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/switch-to-user.conf b/tests/scripts/switch-to-user.conf
index d3d9e045..0b92413b 100644
--- a/tests/scripts/switch-to-user.conf
+++ b/tests/scripts/switch-to-user.conf
@@ -1,5 +1,2 @@
 [LightDM]
-
-[test-greeter-config]
-username=alice
-password=password
+seats=test-seat
diff --git a/tests/scripts/switch-to-user.script b/tests/scripts/switch-to-user.script
index b0153d07..5602000f 100644
--- a/tests/scripts/switch-to-user.script
+++ b/tests/scripts/switch-to-user.script
@@ -5,59 +5,29 @@
 RUNNER DAEMON-START
 *WAIT
 
-# Show a greeter with alice selected
-*SWITCH-TO-USER USERNAME=alice
-RUNNER SWITCH-TO-USER USERNAME=alice
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
+# X server starts
+XSERVER :50 START
+XSERVER :50 INDICATE-READY
+XSERVER :50 ACCEPT-CONNECT
+
+# Greeter starts
 GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
+XSERVER :50 ACCEPT-CONNECT
+GREETER CONNECT-XSERVER :50
 GREETER CONNECT-TO-DAEMON
 GREETER CONNECTED-TO-DAEMON
 
-# Alice is logged in
-GREETER LOGIN USERNAME=alice
-GREETER SHOW-PROMPT TEXT="Password:"
-GREETER RESPOND TEXT="password"
-GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
-GREETER QUIT
-SESSION START USER=alice
-XSERVER :.* ACCEPT-CONNECT
-SESSION CONNECT-XSERVER
-
-# Switch again, should not do anything as user session already running
+# Switch to Alice's account
 *SWITCH-TO-USER USERNAME=alice
 RUNNER SWITCH-TO-USER USERNAME=alice
-*WAIT
 
-# Show a new greeter
-*SHOW-GREETER
-RUNNER SHOW-GREETER
-XSERVER :.* START
-XSERVER :.* INDICATE-READY
-XSERVER :.* ACCEPT-CONNECT
-GREETER START
-XSERVER :.* ACCEPT-CONNECT
-GREETER CONNECT-XSERVER :.*
-GREETER CONNECT-TO-DAEMON
-GREETER CONNECTED-TO-DAEMON
-
-# Log in as alice
+# Existing greeter does the action
 GREETER LOGIN USERNAME=alice
 GREETER SHOW-PROMPT TEXT="Password:"
-GREETER RESPOND TEXT="password"
-GREETER AUTHENTICATION-COMPLETE AUTHENTICATED=TRUE
-
-# New display should quit, and first login should be actived
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(GREETER TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-*WAIT
 
 # Cleanup
 *STOP-DAEMON
 # Don't know what order they will terminate
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
-(SESSION TERMINATE SIGNAL=15|XSERVER :.* TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+(GREETER TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
 RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/scripts/xserver-fail-start.script b/tests/scripts/xserver-fail-start.script
index b7d9881f..6d6eb478 100644
--- a/tests/scripts/xserver-fail-start.script
+++ b/tests/scripts/xserver-fail-start.script
@@ -2,6 +2,6 @@
 # Check that LightDM handles an X server that fails to start.
 #
 RUNNER DAEMON-START
-XSERVER :.* START
-XSERVER :.* EXIT CODE=1
+XSERVER :50 START
+XSERVER :50 EXIT CODE=1
 RUNNER DAEMON-TERMINATE SIGNAL=15