Correctly set $XDG_SESSION_CLASS for greeters. This was regressed in 1.7.5 for ConsoleKit and was never passed to logind.

117 files changed, 139 insertions, 127 deletions

diff --git a/tests/scripts/autologin-guest-fail-setup-script.conf b/tests/scripts/autologin-guest-fail-setup-script.conf
index f35e9ef3..535d65ee 100644
--- a/tests/scripts/autologin-guest-fail-setup-script.conf
+++ b/tests/scripts/autologin-guest-fail-setup-script.conf
@@ -22,7 +22,7 @@ user-session=default
 # (guest account attempts to start and fails)
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-guest-in-background.conf b/tests/scripts/autologin-guest-in-background.conf
index 5ab0dec5..2f8ed888 100644
--- a/tests/scripts/autologin-guest-in-background.conf
+++ b/tests/scripts/autologin-guest-in-background.conf
@@ -17,7 +17,7 @@ user-session=default
 #?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-guest-logout.conf b/tests/scripts/autologin-guest-logout.conf
index 6db13081..4cb045c4 100644
--- a/tests/scripts/autologin-guest-logout.conf
+++ b/tests/scripts/autologin-guest-logout.conf
@@ -45,7 +45,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-guest-timeout.conf b/tests/scripts/autologin-guest-timeout.conf
index b840419d..63c359e1 100644
--- a/tests/scripts/autologin-guest-timeout.conf
+++ b/tests/scripts/autologin-guest-timeout.conf
@@ -21,7 +21,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-in-background.conf b/tests/scripts/autologin-in-background.conf
index 59beb6d4..ca5b17fa 100644
--- a/tests/scripts/autologin-in-background.conf
+++ b/tests/scripts/autologin-in-background.conf
@@ -14,7 +14,7 @@ user-session=default
 #?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-invalid-session.conf b/tests/scripts/autologin-invalid-session.conf
index 01600a63..fc48503c 100644
--- a/tests/scripts/autologin-invalid-session.conf
+++ b/tests/scripts/autologin-invalid-session.conf
@@ -19,7 +19,7 @@ user-session=invalid
 # (session fails to start)
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-invalid-user.conf b/tests/scripts/autologin-invalid-user.conf
index 73681fd5..fc40621c 100644
--- a/tests/scripts/autologin-invalid-user.conf
+++ b/tests/scripts/autologin-invalid-user.conf
@@ -18,7 +18,7 @@ autologin-user=invalid
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-logout.conf b/tests/scripts/autologin-logout.conf
index 38c9e460..cfa562ce 100644
--- a/tests/scripts/autologin-logout.conf
+++ b/tests/scripts/autologin-logout.conf
@@ -36,7 +36,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-new-authtok.conf b/tests/scripts/autologin-new-authtok.conf
index 293b3599..71627a96 100644
--- a/tests/scripts/autologin-new-authtok.conf
+++ b/tests/scripts/autologin-new-authtok.conf
@@ -19,7 +19,7 @@ user-session=default
 # (Session fails)
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-password.conf b/tests/scripts/autologin-password.conf
index 1d7bb03f..d00e50d2 100644
--- a/tests/scripts/autologin-password.conf
+++ b/tests/scripts/autologin-password.conf
@@ -19,7 +19,7 @@ user-session=default
 # (Session fails)
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-session-crash.conf b/tests/scripts/autologin-session-crash.conf
index 8cb38ac4..9a3eea24 100644
--- a/tests/scripts/autologin-session-crash.conf
+++ b/tests/scripts/autologin-session-crash.conf
@@ -36,7 +36,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-session-error.conf b/tests/scripts/autologin-session-error.conf
index f9499b66..18dc9906 100644
--- a/tests/scripts/autologin-session-error.conf
+++ b/tests/scripts/autologin-session-error.conf
@@ -30,7 +30,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-timeout-in-background.conf b/tests/scripts/autologin-timeout-in-background.conf
index 145a6bd8..5c0dfbf0 100644
--- a/tests/scripts/autologin-timeout-in-background.conf
+++ b/tests/scripts/autologin-timeout-in-background.conf
@@ -15,7 +15,7 @@ user-session=default
 #?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-timeout.conf b/tests/scripts/autologin-timeout.conf
index b233a490..774cba42 100644
--- a/tests/scripts/autologin-timeout.conf
+++ b/tests/scripts/autologin-timeout.conf
@@ -18,7 +18,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/autologin-xserver-crash.conf b/tests/scripts/autologin-xserver-crash.conf
index c5367316..5c4d6ef4 100644
--- a/tests/scripts/autologin-xserver-crash.conf
+++ b/tests/scripts/autologin-xserver-crash.conf
@@ -34,7 +34,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/cancel-authentication.conf b/tests/scripts/cancel-authentication.conf
index 8c907ea1..fd93df07 100644
--- a/tests/scripts/cancel-authentication.conf
+++ b/tests/scripts/cancel-authentication.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/change-authentication.conf b/tests/scripts/change-authentication.conf
index 1151ed80..401a1422 100644
--- a/tests/scripts/change-authentication.conf
+++ b/tests/scripts/change-authentication.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/crash-authenticate.conf b/tests/scripts/crash-authenticate.conf
index 73a513d4..922e91d0 100644
--- a/tests/scripts/crash-authenticate.conf
+++ b/tests/scripts/crash-authenticate.conf
@@ -19,7 +19,7 @@ user-session=default
 # (authentication crashes)
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/cred-error.conf b/tests/scripts/cred-error.conf
index 367db5c1..788c3550 100644
--- a/tests/scripts/cred-error.conf
+++ b/tests/scripts/cred-error.conf
@@ -30,7 +30,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/cred-expired.conf b/tests/scripts/cred-expired.conf
index 53eecd93..2e4279dd 100644
--- a/tests/scripts/cred-expired.conf
+++ b/tests/scripts/cred-expired.conf
@@ -30,7 +30,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/cred-unavail.conf b/tests/scripts/cred-unavail.conf
index 6878c1d4..4ff210ad 100644
--- a/tests/scripts/cred-unavail.conf
+++ b/tests/scripts/cred-unavail.conf
@@ -30,7 +30,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/dbus.conf b/tests/scripts/dbus.conf
index bc33db76..82bb5845 100644
--- a/tests/scripts/dbus.conf
+++ b/tests/scripts/dbus.conf
@@ -16,7 +16,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/denied.conf b/tests/scripts/denied.conf
index 47a3bc8e..cba728c3 100644
--- a/tests/scripts/denied.conf
+++ b/tests/scripts/denied.conf
@@ -19,7 +19,7 @@ user-session=default
 # (Session fails)
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/expired.conf b/tests/scripts/expired.conf
index 8125b8c4..8a4991f2 100644
--- a/tests/scripts/expired.conf
+++ b/tests/scripts/expired.conf
@@ -19,7 +19,7 @@ user-session=default
 # (Session fails)
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-allow-guest.conf b/tests/scripts/greeter-allow-guest.conf
index baf8903e..664c89cd 100644
--- a/tests/scripts/greeter-allow-guest.conf
+++ b/tests/scripts/greeter-allow-guest.conf
@@ -16,7 +16,7 @@ greeter-allow-guest=false
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-default-session.conf b/tests/scripts/greeter-default-session.conf
index 0b78a47c..5c99941e 100644
--- a/tests/scripts/greeter-default-session.conf
+++ b/tests/scripts/greeter-default-session.conf
@@ -16,7 +16,7 @@ user-session=alternative
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-fail-start.conf b/tests/scripts/greeter-fail-start.conf
index df035e1f..5910691f 100644
--- a/tests/scripts/greeter-fail-start.conf
+++ b/tests/scripts/greeter-fail-start.conf
@@ -16,7 +16,7 @@ return-value=1
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter fails to start
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?GREETER-X-0 EXIT CODE=1
 
 # X server stopped
diff --git a/tests/scripts/greeter-hide-users.conf b/tests/scripts/greeter-hide-users.conf
index 22b129d9..3db2f081 100644
--- a/tests/scripts/greeter-hide-users.conf
+++ b/tests/scripts/greeter-hide-users.conf
@@ -16,7 +16,7 @@ greeter-hide-users=true
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-show-manual-login.conf b/tests/scripts/greeter-show-manual-login.conf
index 38e2c1e0..2d40787d 100644
--- a/tests/scripts/greeter-show-manual-login.conf
+++ b/tests/scripts/greeter-show-manual-login.conf
@@ -16,7 +16,7 @@ greeter-show-manual-login=true
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-show-remote-login.conf b/tests/scripts/greeter-show-remote-login.conf
index 1fe462dd..459c235c 100644
--- a/tests/scripts/greeter-show-remote-login.conf
+++ b/tests/scripts/greeter-show-remote-login.conf
@@ -16,7 +16,7 @@ greeter-show-remote-login=false
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-wrapper.conf b/tests/scripts/greeter-wrapper.conf
index 111a6e99..9d6c1869 100644
--- a/tests/scripts/greeter-wrapper.conf
+++ b/tests/scripts/greeter-wrapper.conf
@@ -19,7 +19,7 @@ greeter-wrapper=test-greeter-wrapper
 #?GREETER-WRAPPER-X-0 START
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/greeter-xserver-crash.conf b/tests/scripts/greeter-xserver-crash.conf
index 0b0e24e6..89d04c1a 100644
--- a/tests/scripts/greeter-xserver-crash.conf
+++ b/tests/scripts/greeter-xserver-crash.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -34,7 +34,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/keyboard-layout.conf b/tests/scripts/keyboard-layout.conf
index 76d62395..b2db4c23 100644
--- a/tests/scripts/keyboard-layout.conf
+++ b/tests/scripts/keyboard-layout.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/language-no-accounts-service.conf b/tests/scripts/language-no-accounts-service.conf
index 544a0533..9cc0b3fd 100644
--- a/tests/scripts/language-no-accounts-service.conf
+++ b/tests/scripts/language-no-accounts-service.conf
@@ -16,7 +16,7 @@ disable-accounts-service=true
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/language.conf b/tests/scripts/language.conf
index 04abe16c..e4e4a6a6 100644
--- a/tests/scripts/language.conf
+++ b/tests/scripts/language.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-seat-console-kit.conf b/tests/scripts/lock-seat-console-kit.conf
index 08b4af6c..8d9ffc2b 100644
--- a/tests/scripts/lock-seat-console-kit.conf
+++ b/tests/scripts/lock-seat-console-kit.conf
@@ -40,7 +40,7 @@ user-session=default
 #?CONSOLE-KIT LOCK-SESSION
 
 # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_COOKIE=ck-cookie-x:1
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_COOKIE=ck-cookie-x:1 XDG_SESSION_CLASS=greeter
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-seat-return-session-console-kit.conf b/tests/scripts/lock-seat-return-session-console-kit.conf
index 58cba918..a9c5224d 100644
--- a/tests/scripts/lock-seat-return-session-console-kit.conf
+++ b/tests/scripts/lock-seat-return-session-console-kit.conf
@@ -40,7 +40,7 @@ user-session=default
 #?CONSOLE-KIT LOCK-SESSION
 
 # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_COOKIE=ck-cookie-x:1
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_COOKIE=ck-cookie-x:1 XDG_SESSION_CLASS=greeter
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-seat-return-session.conf b/tests/scripts/lock-seat-return-session.conf
index 94b34293..e48d930b 100644
--- a/tests/scripts/lock-seat-return-session.conf
+++ b/tests/scripts/lock-seat-return-session.conf
@@ -37,7 +37,7 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-seat.conf b/tests/scripts/lock-seat.conf
index 88f7a727..6adb733a 100644
--- a/tests/scripts/lock-seat.conf
+++ b/tests/scripts/lock-seat.conf
@@ -37,7 +37,7 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-session-no-password.conf b/tests/scripts/lock-session-no-password.conf
index 7b4c70fb..77fe3660 100644
--- a/tests/scripts/lock-session-no-password.conf
+++ b/tests/scripts/lock-session-no-password.conf
@@ -37,7 +37,7 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # Greeter starts with session user selected
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-session-return-session.conf b/tests/scripts/lock-session-return-session.conf
index 68e79c49..b902db50 100644
--- a/tests/scripts/lock-session-return-session.conf
+++ b/tests/scripts/lock-session-return-session.conf
@@ -34,7 +34,7 @@ user-session=default
 #?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts with session user selected
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/lock-session.conf b/tests/scripts/lock-session.conf
index 2a8d1558..1af93f26 100644
--- a/tests/scripts/lock-session.conf
+++ b/tests/scripts/lock-session.conf
@@ -37,7 +37,7 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # Greeter starts with session user selected
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-crash-authenticate.conf b/tests/scripts/login-crash-authenticate.conf
index 3017e720..bb9b73d2 100644
--- a/tests/scripts/login-crash-authenticate.conf
+++ b/tests/scripts/login-crash-authenticate.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-guest-disabled.conf b/tests/scripts/login-guest-disabled.conf
index fcab4672..3b3b1d56 100644
--- a/tests/scripts/login-guest-disabled.conf
+++ b/tests/scripts/login-guest-disabled.conf
@@ -16,7 +16,7 @@ allow-guest=false
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-guest-fail-setup-script.conf b/tests/scripts/login-guest-fail-setup-script.conf
index b6f2b077..1285822f 100644
--- a/tests/scripts/login-guest-fail-setup-script.conf
+++ b/tests/scripts/login-guest-fail-setup-script.conf
@@ -19,7 +19,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -34,7 +34,7 @@ user-session=default
 # (guest account attempts to start and fails)
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-guest-logout.conf b/tests/scripts/login-guest-logout.conf
index 1b1a2697..949d6c9c 100644
--- a/tests/scripts/login-guest-logout.conf
+++ b/tests/scripts/login-guest-logout.conf
@@ -19,7 +19,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -57,7 +57,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-guest-no-setup-script.conf b/tests/scripts/login-guest-no-setup-script.conf
index 431df579..cbb1f2a5 100644
--- a/tests/scripts/login-guest-no-setup-script.conf
+++ b/tests/scripts/login-guest-no-setup-script.conf
@@ -16,7 +16,7 @@ guest-account-script=
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-guest.conf b/tests/scripts/login-guest.conf
index 112ad103..1b1c09a0 100644
--- a/tests/scripts/login-guest.conf
+++ b/tests/scripts/login-guest.conf
@@ -19,7 +19,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-info-prompt.conf b/tests/scripts/login-info-prompt.conf
index ff5b7cbb..f0172c0f 100644
--- a/tests/scripts/login-info-prompt.conf
+++ b/tests/scripts/login-info-prompt.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-invalid-session.conf b/tests/scripts/login-invalid-session.conf
index f562ae55..aced2fe2 100644
--- a/tests/scripts/login-invalid-session.conf
+++ b/tests/scripts/login-invalid-session.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-invalid-user.conf b/tests/scripts/login-invalid-user.conf
index bc72f461..8589ebdf 100644
--- a/tests/scripts/login-invalid-user.conf
+++ b/tests/scripts/login-invalid-user.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-logout.conf b/tests/scripts/login-logout.conf
index 94c90dd2..0c969c6f 100644
--- a/tests/scripts/login-logout.conf
+++ b/tests/scripts/login-logout.conf
@@ -16,7 +16,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -50,7 +50,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-long-password.conf b/tests/scripts/login-long-password.conf
index 8f9dcbc3..61c54a8f 100644
--- a/tests/scripts/login-long-password.conf
+++ b/tests/scripts/login-long-password.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-long-username.conf b/tests/scripts/login-long-username.conf
index 7b2efc16..4f7a1733 100644
--- a/tests/scripts/login-long-username.conf
+++ b/tests/scripts/login-long-username.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-manual-previous-session.conf b/tests/scripts/login-manual-previous-session.conf
index b4c1fc24..639ddd15 100644
--- a/tests/scripts/login-manual-previous-session.conf
+++ b/tests/scripts/login-manual-previous-session.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-manual-remember-session.conf b/tests/scripts/login-manual-remember-session.conf
index 4efaa7f0..813e0a1d 100644
--- a/tests/scripts/login-manual-remember-session.conf
+++ b/tests/scripts/login-manual-remember-session.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -47,7 +47,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-manual.conf b/tests/scripts/login-manual.conf
index abd6738b..087c4a19 100644
--- a/tests/scripts/login-manual.conf
+++ b/tests/scripts/login-manual.conf
@@ -16,7 +16,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-multi-info-prompt.conf b/tests/scripts/login-multi-info-prompt.conf
index f42ba2b9..b0d3afc3 100644
--- a/tests/scripts/login-multi-info-prompt.conf
+++ b/tests/scripts/login-multi-info-prompt.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-multi-prompt.conf b/tests/scripts/login-multi-prompt.conf
index 9b765960..f3828601 100644
--- a/tests/scripts/login-multi-prompt.conf
+++ b/tests/scripts/login-multi-prompt.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-new-authtok.conf b/tests/scripts/login-new-authtok.conf
index 24936df5..36843128 100644
--- a/tests/scripts/login-new-authtok.conf
+++ b/tests/scripts/login-new-authtok.conf
@@ -16,7 +16,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-no-password.conf b/tests/scripts/login-no-password.conf
index ab90dd28..19dd3038 100644
--- a/tests/scripts/login-no-password.conf
+++ b/tests/scripts/login-no-password.conf
@@ -16,7 +16,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-pam.conf b/tests/scripts/login-pam.conf
index 2b627f4c..9fdf9fff 100644
--- a/tests/scripts/login-pam.conf
+++ b/tests/scripts/login-pam.conf
@@ -16,7 +16,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-pick-session.conf b/tests/scripts/login-pick-session.conf
index ca20ed56..782d79bc 100644
--- a/tests/scripts/login-pick-session.conf
+++ b/tests/scripts/login-pick-session.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-previous-session.conf b/tests/scripts/login-previous-session.conf
index f5eef9f9..ff4786bd 100644
--- a/tests/scripts/login-previous-session.conf
+++ b/tests/scripts/login-previous-session.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-remember-session.conf b/tests/scripts/login-remember-session.conf
index 2152c586..5afa9c6d 100644
--- a/tests/scripts/login-remember-session.conf
+++ b/tests/scripts/login-remember-session.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -45,7 +45,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-remote-session.conf b/tests/scripts/login-remote-session.conf
index 40ca7dcb..515ca18b 100644
--- a/tests/scripts/login-remote-session.conf
+++ b/tests/scripts/login-remote-session.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-session-crash.conf b/tests/scripts/login-session-crash.conf
index b0e5386d..22b41e99 100644
--- a/tests/scripts/login-session-crash.conf
+++ b/tests/scripts/login-session-crash.conf
@@ -16,7 +16,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -50,7 +50,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-two-factor.conf b/tests/scripts/login-two-factor.conf
index edc669a1..9400fbca 100644
--- a/tests/scripts/login-two-factor.conf
+++ b/tests/scripts/login-two-factor.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-wrong-password.conf b/tests/scripts/login-wrong-password.conf
index 93777602..3fc8e40b 100644
--- a/tests/scripts/login-wrong-password.conf
+++ b/tests/scripts/login-wrong-password.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login-xserver-crash.conf b/tests/scripts/login-xserver-crash.conf
index 37d5b409..d9bddfae 100644
--- a/tests/scripts/login-xserver-crash.conf
+++ b/tests/scripts/login-xserver-crash.conf
@@ -16,7 +16,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -48,7 +48,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/login.conf b/tests/scripts/login.conf
index 1df16785..6bc99004 100644
--- a/tests/scripts/login.conf
+++ b/tests/scripts/login.conf
@@ -16,7 +16,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/mir-autologin.conf b/tests/scripts/mir-autologin.conf
index 9d59e043..373ec805 100644
--- a/tests/scripts/mir-autologin.conf
+++ b/tests/scripts/mir-autologin.conf
@@ -19,7 +19,7 @@ user-session=mir
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/mir-session.conf b/tests/scripts/mir-session.conf
index cc1e9f7b..02df79c2 100644
--- a/tests/scripts/mir-session.conf
+++ b/tests/scripts/mir-session.conf
@@ -16,7 +16,7 @@ user-session=mir
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/no-config.conf b/tests/scripts/no-config.conf
index da7c7444..d8d4f167 100644
--- a/tests/scripts/no-config.conf
+++ b/tests/scripts/no-config.conf
@@ -16,7 +16,7 @@ have-config=false
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/no-keyboard-layout.conf b/tests/scripts/no-keyboard-layout.conf
index 62ac596c..9b066c1f 100644
--- a/tests/scripts/no-keyboard-layout.conf
+++ b/tests/scripts/no-keyboard-layout.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/no-language.conf b/tests/scripts/no-language.conf
index 8d299eb4..89bc5a42 100644
--- a/tests/scripts/no-language.conf
+++ b/tests/scripts/no-language.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/open-file-descriptors.conf b/tests/scripts/open-file-descriptors.conf
index 065f4641..afc0c00f 100644
--- a/tests/scripts/open-file-descriptors.conf
+++ b/tests/scripts/open-file-descriptors.conf
@@ -17,7 +17,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/plymouth-active-vt.conf b/tests/scripts/plymouth-active-vt.conf
index 06e9b3a3..e23925d5 100644
--- a/tests/scripts/plymouth-active-vt.conf
+++ b/tests/scripts/plymouth-active-vt.conf
@@ -26,7 +26,7 @@ active=true
 #?PLYMOUTH QUIT RETAIN-SPLASH=TRUE
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/plymouth-inactive-vt.conf b/tests/scripts/plymouth-inactive-vt.conf
index 99549bae..3a09a70f 100644
--- a/tests/scripts/plymouth-inactive-vt.conf
+++ b/tests/scripts/plymouth-inactive-vt.conf
@@ -20,7 +20,7 @@ active=true
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/power-no-console-kit.conf b/tests/scripts/power-no-console-kit.conf
index fba753b9..bd685c2b 100644
--- a/tests/scripts/power-no-console-kit.conf
+++ b/tests/scripts/power-no-console-kit.conf
@@ -16,7 +16,7 @@ disable-console-kit=true
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/power-no-login1.conf b/tests/scripts/power-no-login1.conf
index 5115b358..19e87727 100644
--- a/tests/scripts/power-no-login1.conf
+++ b/tests/scripts/power-no-login1.conf
@@ -16,7 +16,7 @@ disable-login1=true
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_COOKIE=ck-cookie-x:0
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_COOKIE=ck-cookie-x:0 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/power-no-services.conf b/tests/scripts/power-no-services.conf
index 71a71288..e1cf0ebc 100644
--- a/tests/scripts/power-no-services.conf
+++ b/tests/scripts/power-no-services.conf
@@ -18,7 +18,7 @@ disable-login1=true
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/power.conf b/tests/scripts/power.conf
index 27f6ca76..9477847f 100644
--- a/tests/scripts/power.conf
+++ b/tests/scripts/power.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/restart-authentication.conf b/tests/scripts/restart-authentication.conf
index 0bcbda86..a0732ae9 100644
--- a/tests/scripts/restart-authentication.conf
+++ b/tests/scripts/restart-authentication.conf
@@ -13,7 +13,7 @@
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/script-hook-fail-session-setup.conf b/tests/scripts/script-hook-fail-session-setup.conf
index 50db0649..0c79af28 100644
--- a/tests/scripts/script-hook-fail-session-setup.conf
+++ b/tests/scripts/script-hook-fail-session-setup.conf
@@ -21,7 +21,7 @@ user-session=default
 #?SCRIPT-HOOK SESSION-SETUP
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/script-hooks.conf b/tests/scripts/script-hooks.conf
index 0a3069e5..dc573bab 100644
--- a/tests/scripts/script-hooks.conf
+++ b/tests/scripts/script-hooks.conf
@@ -51,7 +51,7 @@ user-session=default
 #?SCRIPT-HOOK GREETER-SETUP
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/session-stderr-backup.conf b/tests/scripts/session-stderr-backup.conf
index 557337cf..53f5081e 100644
--- a/tests/scripts/session-stderr-backup.conf
+++ b/tests/scripts/session-stderr-backup.conf
@@ -33,7 +33,7 @@ user-session=default
 #?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
@@ -62,7 +62,7 @@ user-session=default
 #?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-greeter-new-session.conf b/tests/scripts/switch-to-greeter-new-session.conf
index 9f3a9d63..a59bd4e0 100644
--- a/tests/scripts/switch-to-greeter-new-session.conf
+++ b/tests/scripts/switch-to-greeter-new-session.conf
@@ -37,7 +37,7 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-greeter-return-session-logout.conf b/tests/scripts/switch-to-greeter-return-session-logout.conf
index 304ba15e..f6b23faa 100644
--- a/tests/scripts/switch-to-greeter-return-session-logout.conf
+++ b/tests/scripts/switch-to-greeter-return-session-logout.conf
@@ -37,7 +37,7 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON
@@ -74,7 +74,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-greeter-return-session.conf b/tests/scripts/switch-to-greeter-return-session.conf
index 52df4248..366848c7 100644
--- a/tests/scripts/switch-to-greeter-return-session.conf
+++ b/tests/scripts/switch-to-greeter-return-session.conf
@@ -37,7 +37,7 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-greeter.conf b/tests/scripts/switch-to-greeter.conf
index e84a5129..09ecc947 100644
--- a/tests/scripts/switch-to-greeter.conf
+++ b/tests/scripts/switch-to-greeter.conf
@@ -37,7 +37,7 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-user-existing.conf b/tests/scripts/switch-to-user-existing.conf
index 74dbc147..ea36a4af 100644
--- a/tests/scripts/switch-to-user-existing.conf
+++ b/tests/scripts/switch-to-user-existing.conf
@@ -58,7 +58,7 @@ user-session=default
 #?XSERVER-2 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=9
+#?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=9 XDG_SESSION_CLASS=greeter
 #?XSERVER-2 ACCEPT-CONNECT
 #?GREETER-X-2 CONNECT-XSERVER
 #?GREETER-X-2 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-user-logout-active.conf b/tests/scripts/switch-to-user-logout-active.conf
index 825d316c..f070eea6 100644
--- a/tests/scripts/switch-to-user-logout-active.conf
+++ b/tests/scripts/switch-to-user-logout-active.conf
@@ -58,7 +58,7 @@ user-session=default
 #?XSERVER-1 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/switch-to-user.conf b/tests/scripts/switch-to-user.conf
index a2d3c4e4..e58596e6 100644
--- a/tests/scripts/switch-to-user.conf
+++ b/tests/scripts/switch-to-user.conf
@@ -38,7 +38,7 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_SESSION_CLASS=greeter
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-compositor-command.conf b/tests/scripts/unity-compositor-command.conf
index 01a2b01e..f831cde9 100644
--- a/tests/scripts/unity-compositor-command.conf
+++ b/tests/scripts/unity-compositor-command.conf
@@ -22,7 +22,7 @@ unity-compositor-command=unity-system-compositor --test
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-compositor-fail-ready.conf b/tests/scripts/unity-compositor-fail-ready.conf
index 4b847e9a..d197d9fc 100644
--- a/tests/scripts/unity-compositor-fail-ready.conf
+++ b/tests/scripts/unity-compositor-fail-ready.conf
@@ -23,7 +23,7 @@ unity-compositor-timeout=1
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-compositor-fail-start.conf b/tests/scripts/unity-compositor-fail-start.conf
index 2edcdf52..25e6e45a 100644
--- a/tests/scripts/unity-compositor-fail-start.conf
+++ b/tests/scripts/unity-compositor-fail-start.conf
@@ -23,7 +23,7 @@ type=unity
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-compositor-next-session.conf b/tests/scripts/unity-compositor-next-session.conf
index d1f3f914..bf22505e 100644
--- a/tests/scripts/unity-compositor-next-session.conf
+++ b/tests/scripts/unity-compositor-next-session.conf
@@ -19,7 +19,7 @@ autologin-in-background=true
 #?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-login.conf b/tests/scripts/unity-login.conf
index 1e2b14d6..7c1a28c6 100644
--- a/tests/scripts/unity-login.conf
+++ b/tests/scripts/unity-login.conf
@@ -21,7 +21,7 @@ user-session=default
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-mir-greeter-mir-session.conf b/tests/scripts/unity-mir-greeter-mir-session.conf
index 608ca078..d3d462ba 100644
--- a/tests/scripts/unity-mir-greeter-mir-session.conf
+++ b/tests/scripts/unity-mir-greeter-mir-session.conf
@@ -13,7 +13,7 @@ user-session=mir
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Greeter starts
-#?GREETER-MIR-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-MIR-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?GREETER-MIR-0 CONNECT-TO-DAEMON
 #?GREETER-MIR-0 CONNECTED-TO-DAEMON
 
diff --git a/tests/scripts/unity-mir-greeter-x-session.conf b/tests/scripts/unity-mir-greeter-x-session.conf
index 2edb7135..a577faf0 100644
--- a/tests/scripts/unity-mir-greeter-x-session.conf
+++ b/tests/scripts/unity-mir-greeter-x-session.conf
@@ -13,7 +13,7 @@ user-session=default
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Greeter starts
-#?GREETER-MIR-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-MIR-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?GREETER-MIR-0 CONNECT-TO-DAEMON
 #?GREETER-MIR-0 CONNECTED-TO-DAEMON
 
diff --git a/tests/scripts/unity-mir-session-x-greeter.conf b/tests/scripts/unity-mir-session-x-greeter.conf
index 3fe743ae..335214bf 100644
--- a/tests/scripts/unity-mir-session-x-greeter.conf
+++ b/tests/scripts/unity-mir-session-x-greeter.conf
@@ -21,7 +21,7 @@ user-session=mir
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/unity-switch.conf b/tests/scripts/unity-switch.conf
index 7bd8981d..e78994d9 100644
--- a/tests/scripts/unity-switch.conf
+++ b/tests/scripts/unity-switch.conf
@@ -45,7 +45,7 @@ user-session=default
 #?LOGIN1 LOCK-SESSION
 
 # Greeter starts
-#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-1 ACCEPT-CONNECT
 #?GREETER-X-1 CONNECT-XSERVER
 #?GREETER-X-1 CONNECT-TO-DAEMON
@@ -78,7 +78,7 @@ user-session=default
 #?XSERVER-2 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-2 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-2 ACCEPT-CONNECT
 #?GREETER-X-2 CONNECT-XSERVER
 #?GREETER-X-2 CONNECT-TO-DAEMON
diff --git a/tests/scripts/upstart-login.conf b/tests/scripts/upstart-login.conf
index bffc1f06..7267ab66 100644
--- a/tests/scripts/upstart-login.conf
+++ b/tests/scripts/upstart-login.conf
@@ -21,7 +21,7 @@ report-events=true
 #?INIT -q emit login-session-start DISPLAY_MANAGER=lightdm
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/user-renamed-invalid.conf b/tests/scripts/user-renamed-invalid.conf
index 5c87285a..d1fbcefa 100644
--- a/tests/scripts/user-renamed-invalid.conf
+++ b/tests/scripts/user-renamed-invalid.conf
@@ -19,7 +19,7 @@ user-session=default
 # (fails to start session for invalid user)
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/users.conf b/tests/scripts/users.conf
index 71d84757..ea9c90db 100644
--- a/tests/scripts/users.conf
+++ b/tests/scripts/users.conf
@@ -19,7 +19,7 @@ log-user-changes=true
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/vnc-command.conf b/tests/scripts/vnc-command.conf
index 3c4ad392..351437e0 100644
--- a/tests/scripts/vnc-command.conf
+++ b/tests/scripts/vnc-command.conf
@@ -32,7 +32,7 @@ command=Xvnc -option
 #?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
 
 # Greeter starts and connects to remote X server
-#?GREETER-X-0 START
+#?GREETER-X-0 START XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/vnc-dimensions.conf b/tests/scripts/vnc-dimensions.conf
index 4fdfeed8..0a418e93 100644
--- a/tests/scripts/vnc-dimensions.conf
+++ b/tests/scripts/vnc-dimensions.conf
@@ -34,7 +34,7 @@ depth=16
 #?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
 
 # Greeter starts and connects to remote X server
-#?GREETER-X-0 START
+#?GREETER-X-0 START XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/vnc-login.conf b/tests/scripts/vnc-login.conf
index d3b0ee13..2c28afab 100644
--- a/tests/scripts/vnc-login.conf
+++ b/tests/scripts/vnc-login.conf
@@ -36,7 +36,7 @@ user-session=default
 #?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
 
 # Greeter starts and connects to remote X server
-#?GREETER-X-0 START
+#?GREETER-X-0 START XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/vnc-open-file-descriptors.conf b/tests/scripts/vnc-open-file-descriptors.conf
index 937ba913..f7ce29f2 100644
--- a/tests/scripts/vnc-open-file-descriptors.conf
+++ b/tests/scripts/vnc-open-file-descriptors.conf
@@ -35,7 +35,7 @@ user-session=default
 #?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
 
 # Greeter starts and connects to remote X server
-#?GREETER-X-0 START
+#?GREETER-X-0 START XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/scripts/xdmcp-server-login.conf b/tests/scripts/xdmcp-server-login.conf
index c2e38df5..bd3fe14f 100644
--- a/tests/scripts/xdmcp-server-login.conf
+++ b/tests/scripts/xdmcp-server-login.conf
@@ -33,7 +33,7 @@ user-session=default
 #?XSERVER-98 ACCEPT-CONNECT
 
 # Greeter starts and connects to remote X server
-#?GREETER-X-127.0.0.1:98 START
+#?GREETER-X-127.0.0.1:98 START XDG_SESSION_CLASS=greeter
 #?XSERVER-98 ACCEPT-CONNECT
 #?GREETER-X-127.0.0.1:98 CONNECT-XSERVER
 #?GREETER-X-127.0.0.1:98 CONNECT-TO-DAEMON
diff --git a/tests/scripts/xdmcp-server-open-file-descriptors.conf b/tests/scripts/xdmcp-server-open-file-descriptors.conf
index 9dac617f..2a75def1 100644
--- a/tests/scripts/xdmcp-server-open-file-descriptors.conf
+++ b/tests/scripts/xdmcp-server-open-file-descriptors.conf
@@ -33,7 +33,7 @@ user-session=default
 #?XSERVER-98 ACCEPT-CONNECT
 
 # Greeter starts and connects to remote X server
-#?GREETER-X-127.0.0.1:98 START
+#?GREETER-X-127.0.0.1:98 START XDG_SESSION_CLASS=greeter
 #?XSERVER-98 ACCEPT-CONNECT
 #?GREETER-X-127.0.0.1:98 CONNECT-XSERVER
 #?GREETER-X-127.0.0.1:98 CONNECT-TO-DAEMON
diff --git a/tests/scripts/xserver-no-share.conf b/tests/scripts/xserver-no-share.conf
index e18e1dcd..6be99036 100644
--- a/tests/scripts/xserver-no-share.conf
+++ b/tests/scripts/xserver-no-share.conf
@@ -17,7 +17,7 @@ xserver-share=false
 #?XSERVER-0 ACCEPT-CONNECT
 
 # Greeter starts
-#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7
+#?GREETER-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_SESSION_CLASS=greeter
 #?XSERVER-0 ACCEPT-CONNECT
 #?GREETER-X-0 CONNECT-XSERVER
 #?GREETER-X-0 CONNECT-TO-DAEMON
diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c
index d970abb6..332ded96 100644
--- a/tests/src/test-gobject-greeter.c
+++ b/tests/src/test-gobject-greeter.c
@@ -299,7 +299,7 @@ user_removed_cb (LightDMUserList *user_list, LightDMUser *user)
 int
 main (int argc, char **argv)
 {
-    gchar *display, *xdg_seat, *xdg_vtnr, *xdg_session_cookie, *mir_socket, *mir_vt, *mir_id;
+    gchar *display, *xdg_seat, *xdg_vtnr, *xdg_session_cookie, *xdg_session_class, *mir_socket, *mir_vt, *mir_id;
     GString *status_text;
 
 #if !defined(GLIB_VERSION_2_36)
@@ -310,6 +310,7 @@ main (int argc, char **argv)
     xdg_seat = getenv ("XDG_SEAT");
     xdg_vtnr = getenv ("XDG_VTNR");
     xdg_session_cookie = getenv ("XDG_SESSION_COOKIE");
+    xdg_session_class = getenv ("XDG_SESSION_CLASS");
     mir_socket = getenv ("MIR_SOCKET");
     mir_vt = getenv ("MIR_SERVER_VT");
     mir_id = getenv ("MIR_ID");
@@ -342,6 +343,8 @@ main (int argc, char **argv)
         g_string_append_printf (status_text, " XDG_VTNR=%s", xdg_vtnr);
     if (xdg_session_cookie)
         g_string_append_printf (status_text, " XDG_SESSION_COOKIE=%s", xdg_session_cookie);
+    if (xdg_session_class)
+        g_string_append_printf (status_text, " XDG_SESSION_CLASS=%s", xdg_session_class);
     if (mir_vt > 0)
         g_string_append_printf (status_text, " MIR_SERVER_VT=%s", mir_vt);
     status_notify (status_text->str);
diff --git a/tests/src/test-python-greeter b/tests/src/test-python-greeter
index eee8575a..f8e5c373 100755
--- a/tests/src/test-python-greeter
+++ b/tests/src/test-python-greeter
@@ -13,6 +13,7 @@ display = os.getenv ('DISPLAY');
 xdg_seat = os.getenv ('XDG_SEAT');
 xdg_vtnr = os.getenv ('XDG_VTNR');
 xdg_session_cookie = os.getenv ('XDG_SESSION_COOKIE');
+xdg_session_class = os.getenv ('XDG_SESSION_CLASS');
 if display is not None:
     if display.startswith (':'):
         greeter_id = 'GREETER-X-%s' % display[1:]
@@ -196,6 +197,8 @@ if xdg_vtnr is not None:
     status_text += ' XDG_VTNR=%s' % xdg_vtnr
 if xdg_session_cookie is not None:
     status_text += ' XDG_SESSION_COOKIE=%s' % xdg_session_cookie
+if xdg_session_class is not None:
+    status_text += ' XDG_SESSION_CLASS=%s' % xdg_session_class
 status_notify (status_text)
 
 config = GLib.KeyFile ()
diff --git a/tests/src/test-qt-greeter.cpp b/tests/src/test-qt-greeter.cpp
index 99e2ef7b..3d24e13f 100644
--- a/tests/src/test-qt-greeter.cpp
+++ b/tests/src/test-qt-greeter.cpp
@@ -243,7 +243,7 @@ request_cb (const gchar *request)
 int
 main(int argc, char *argv[])
 {
-    gchar *display, *xdg_seat, *xdg_vtnr, *xdg_session_cookie;
+    gchar *display, *xdg_seat, *xdg_vtnr, *xdg_session_cookie, *xdg_session_class;
     GString *status_text;   
 
 #if !defined(GLIB_VERSION_2_36)
@@ -254,6 +254,7 @@ main(int argc, char *argv[])
     xdg_seat = getenv ("XDG_SEAT");
     xdg_vtnr = getenv ("XDG_VTNR");
     xdg_session_cookie = getenv ("XDG_SESSION_COOKIE");
+    xdg_session_class = getenv ("XDG_SESSION_CLASS");
     if (display)
     {
         if (display[0] == ':')
@@ -279,6 +280,8 @@ main(int argc, char *argv[])
         g_string_append_printf (status_text, " XDG_VTNR=%s", xdg_vtnr);
     if (xdg_session_cookie)
         g_string_append_printf (status_text, " XDG_SESSION_COOKIE=%s", xdg_session_cookie);
+    if (xdg_session_class)
+        g_string_append_printf (status_text, " XDG_SESSION_CLASS=%s", xdg_session_class);
     status_notify (status_text->str);
     g_string_free (status_text, TRUE);
 
diff --git a/tests/src/test-session.c b/tests/src/test-session.c
index 14ce0146..fd0741dc 100644
--- a/tests/src/test-session.c
+++ b/tests/src/test-session.c
@@ -202,7 +202,7 @@ request_cb (const gchar *request)
 int
 main (int argc, char **argv)
 {
-    gchar *display, *xdg_seat, *xdg_vtnr, *xdg_current_desktop, *xdg_session_cookie, *desktop_session, *mir_socket, *mir_vt, *mir_id;
+    gchar *display, *xdg_seat, *xdg_vtnr, *xdg_current_desktop, *xdg_session_cookie, *xdg_session_class, *desktop_session, *mir_socket, *mir_vt, *mir_id;
     GString *status_text;
     int fd, open_max;
 
@@ -211,6 +211,7 @@ main (int argc, char **argv)
     xdg_vtnr = getenv ("XDG_VTNR");
     xdg_current_desktop = getenv ("XDG_CURRENT_DESKTOP");
     xdg_session_cookie = getenv ("XDG_SESSION_COOKIE");
+    xdg_session_class = getenv ("XDG_SESSION_CLASS");
     desktop_session = getenv ("DESKTOP_SESSION");
     mir_socket = getenv ("MIR_SOCKET");
     mir_vt = getenv ("MIR_SERVER_VT");
@@ -260,6 +261,8 @@ main (int argc, char **argv)
         g_string_append_printf (status_text, " XDG_CURRENT_DESKTOP=%s", xdg_current_desktop);
     if (xdg_session_cookie)
         g_string_append_printf (status_text, " XDG_SESSION_COOKIE=%s", xdg_session_cookie);
+    if (xdg_session_class)
+        g_string_append_printf (status_text, " XDG_SESSION_CLASS=%s", xdg_session_class);
     if (desktop_session)
         g_string_append_printf (status_text, " DESKTOP_SESSION=%s", desktop_session);
     if (mir_vt > 0)