diff --git a/modules/profiles/qemu-guest.nix b/modules/profiles/qemu-guest.nix
index 6eff638e2a25..548cc58732ef 100644
--- a/modules/profiles/qemu-guest.nix
+++ b/modules/profiles/qemu-guest.nix
@@ -4,6 +4,6 @@
 { config, pkgs, ... }:
 
 {
-  boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_console" ];
-  boot.initrd.kernelModules = [ "virtio_balloon" ];
+  boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" ];
+  boot.kernelModules = [ "virtio_balloon" "virtio_console" ];
 }
diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix
index 0802d4f7dbcc..70e6f72acd63 100644
--- a/modules/services/hardware/udev.nix
+++ b/modules/services/hardware/udev.nix
@@ -265,7 +265,7 @@ in
             # http://www.mail-archive.com/fedora-devel-list@redhat.com/msg10261.html
             udevadm control --env=STARTUP=1
             udevadm trigger --action=add
-            udevadm settle # wait for udev to finish
+            udevadm settle || true # wait for udev to finish
             udevadm control --env=STARTUP=
 
             initctl emit -n new-devices
diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index 299a9f8a08f8..86c35f21fab7 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -137,7 +137,7 @@ mkdir -p /dev/.mdadm
 udevd --daemon
 udevadm control --env=STARTUP=1
 udevadm trigger --action=add
-udevadm settle
+udevadm settle || true
 udevadm control --env=STARTUP=
 
 
diff --git a/modules/testing/test-instrumentation.nix b/modules/testing/test-instrumentation.nix
index 122ba84254c9..5e40cf215b7c 100644
--- a/modules/testing/test-instrumentation.nix
+++ b/modules/testing/test-instrumentation.nix
@@ -28,7 +28,7 @@ in
   " {
 
     jobs.backdoor =
-      { startOn = "startup";
+      { startOn = "started udev";
         stopOn = "";
 
         script =