diff --git a/test/boot-environment.nix b/test/boot-environment.nix
index 4d4d98a0ed51..281a6318af04 100644
--- a/test/boot-environment.nix
+++ b/test/boot-environment.nix
@@ -77,12 +77,39 @@ rec {
   };
 
 
+  # The services (Upstart) configuration for the system.
+  upstartJobs = import ./upstart-jobs/gather.nix {
+    inherit (pkgs) stdenv;
+
+    jobs = [
+      # For the builtin logd job.
+      pkgs.upstart 
+
+      # The terminals on ttyX.
+      (map 
+        (ttyNumber: import ./upstart-jobs/mingetty.nix {
+          inherit (pkgs) genericSubstituter;
+          mingetty = pkgs.mingettyWrapper;
+          inherit ttyNumber;
+        })
+        [1 2 3 4 5 6]
+      )
+
+      # Syslogd.
+      (import ./upstart-jobs/syslogd.nix {
+        inherit (pkgs) genericSubstituter sysklogd;
+      })
+    ];
+  };
+
+
   # The init script of boot stage 2, which is supposed to do
   # everything else to bring up the system.
   bootStage2 = import ./boot-stage-2.nix {
     inherit (pkgs) genericSubstituter coreutils findutils
-      utillinux kernel sysklogd udev module_init_tools
+      utillinux kernel udev module_init_tools
       nettools upstart;
+    inherit upstartJobs;
     shell = pkgs.bash + "/bin/sh";
     dhcp = pkgs.dhcpWrapper;
 
@@ -114,8 +141,6 @@ rec {
       nixosInstaller
     ];
 
-    mingetty = pkgs.mingettyWrapper;
-
     inherit readOnlyRoot;
   };
 
diff --git a/test/boot-stage-2-init.sh b/test/boot-stage-2-init.sh
index a80ee2aaa59d..5f68fea82cd7 100644
--- a/test/boot-stage-2-init.sh
+++ b/test/boot-stage-2-init.sh
@@ -68,13 +68,10 @@ udevtrigger
 udevsettle # wait for udev to finish
 
 
-# Start syslogd.
+# Necessary configuration for syslogd.
 mkdir -m 0755 -p /var/run
-#mkdir -p /var/log
-#touch /var/log/messages
 echo "*.* /dev/tty10" > /etc/syslog.conf
 echo "syslog 514/udp" > /etc/services # required, even if we don't use it
-@sysklogd@/sbin/syslogd &
 
 
 # Try to load modules for all PCI devices.
@@ -113,17 +110,8 @@ fi
 
 # Set up the Upstart jobs.
 export UPSTART_CFG_DIR=/etc/event.d
-mkdir -p $UPSTART_CFG_DIR
 
-cp -f @upstart@/etc/event.d/logd $UPSTART_CFG_DIR/logd
-
-for i in $(seq 1 6); do 
-    cat > $UPSTART_CFG_DIR/tty$i <<EOF
-start on startup
-stop on shutdown
-respawn @mingetty@/sbin/mingetty --noclear tty$i
-EOF
-done
+ln -sf @upstartJobs@/etc/event.d /etc/event.d
 
 
 # Show a nice greeting on each terminal.
@@ -156,7 +144,7 @@ hostname nixos
 
 
 # Start an interactive shell.
-@shell@ &
+#exec @shell@
 
 
 # Start Upstart's init.
diff --git a/test/boot-stage-2.nix b/test/boot-stage-2.nix
index b81684d24028..9b37d4cd6f34 100644
--- a/test/boot-stage-2.nix
+++ b/test/boot-stage-2.nix
@@ -1,17 +1,20 @@
 { genericSubstituter, shell, coreutils, findutils
-, utillinux, kernel, sysklogd, mingetty, udev
+, utillinux, kernel, udev
 , module_init_tools, nettools, dhcp, upstart
 , path ? []
 
 , # Whether the root device is root only.  If so, we'll mount a
   # ramdisk on /etc, /var and so on.
   readOnlyRoot
+
+, # The Upstart job configuration.
+  upstartJobs
 }:
 
 genericSubstituter {
   src = ./boot-stage-2-init.sh;
   isExecutable = true;
-  inherit shell kernel sysklogd mingetty upstart readOnlyRoot;
+  inherit shell kernel upstart readOnlyRoot upstartJobs;
   path = [
     coreutils
     findutils
diff --git a/test/rescue-cd.nix b/test/rescue-cd.nix
index d045a903ff92..e66de36e424d 100644
--- a/test/rescue-cd.nix
+++ b/test/rescue-cd.nix
@@ -16,7 +16,7 @@ in
   
 rec {
 
-  inherit nixosInstaller bootStage1; # !!! debug
+  inherit nixosInstaller bootStage1 upstartJobs; # !!! debug
 
 
   # Since the CD is read-only, the mount points must be on disk.
diff --git a/test/upstart-jobs/gather.nix b/test/upstart-jobs/gather.nix
new file mode 100644
index 000000000000..914c78e7a89d
--- /dev/null
+++ b/test/upstart-jobs/gather.nix
@@ -0,0 +1,19 @@
+# Create an etc/event.d directory containing symlinks to the
+# specified list of Upstart job files.
+{stdenv, jobs}:
+
+stdenv.mkDerivation {
+  name = "upstart-jobs";
+
+  inherit jobs;
+
+  builder = builtins.toFile "builder.sh" "
+    source $stdenv/setup
+    ensureDir $out/etc/event.d
+    for i in $jobs; do
+      if test -d $i; then
+        ln -s $i/etc/event.d/* $out/etc/event.d/
+      fi
+    done
+  ";
+}
diff --git a/test/upstart-jobs/mingetty.nix b/test/upstart-jobs/mingetty.nix
new file mode 100644
index 000000000000..0a38bc66e6a5
--- /dev/null
+++ b/test/upstart-jobs/mingetty.nix
@@ -0,0 +1,8 @@
+{genericSubstituter, mingetty, ttyNumber}:
+
+genericSubstituter {
+  src = ./mingetty.sh;
+  dir = "etc/event.d";
+  name = "tty" + toString ttyNumber;
+  inherit mingetty ttyNumber;
+}
diff --git a/test/upstart-jobs/mingetty.sh b/test/upstart-jobs/mingetty.sh
new file mode 100644
index 000000000000..f1eab56510c4
--- /dev/null
+++ b/test/upstart-jobs/mingetty.sh
@@ -0,0 +1,3 @@
+start on startup
+stop on shutdown
+respawn @mingetty@/sbin/mingetty --noclear tty@ttyNumber@
diff --git a/test/upstart-jobs/syslogd.nix b/test/upstart-jobs/syslogd.nix
new file mode 100644
index 000000000000..fddcea6692f5
--- /dev/null
+++ b/test/upstart-jobs/syslogd.nix
@@ -0,0 +1,8 @@
+{genericSubstituter, sysklogd}:
+
+genericSubstituter {
+  src = ./syslogd.sh;
+  dir = "etc/event.d";
+  name = "syslogd";
+  inherit sysklogd;
+}
diff --git a/test/upstart-jobs/syslogd.sh b/test/upstart-jobs/syslogd.sh
new file mode 100644
index 000000000000..d87d5b305577
--- /dev/null
+++ b/test/upstart-jobs/syslogd.sh
@@ -0,0 +1,3 @@
+start on startup
+stop on shutdown
+respawn @sysklogd@/sbin/syslogd -n