1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index a7ed5d1faa38..dbed242eb865 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -602,8 +602,11 @@ sub waitForX {
     $self->nest("waiting for the X11 server", sub {
         retry sub {
             my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'session opened'");
+            my $display = $ENV{'DISPLAY'};
+            $display =~ s/://;
+
             return 0 if $status != 0;
-            ($status, $out) = $self->execute("[ -e /tmp/.X11-unix/X0 ]");
+            ($status, $out) = $self->execute("[ -e /tmp/.X11-unix/X$display ]");
             return 1 if $status == 0;
         }
     });