diff --git a/nixos/tests/orangefs.nix b/nixos/tests/orangefs.nix
index fe9335f74981..5c88a481b709 100644
--- a/nixos/tests/orangefs.nix
+++ b/nixos/tests/orangefs.nix
@@ -5,16 +5,19 @@ let
     { pkgs, ... }:
     {
       networking.firewall.allowedTCPPorts = [ 3334 ];
-      boot.initrd.postDeviceCommands = ''
-        ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb
-      '';
 
-      virtualisation.emptyDiskImages = [ 4096 ];
+      virtualisation.emptyDiskImages = [
+        {
+          size = 4096;
+          driveConfig.deviceExtraOpts.serial = "data";
+        }
+      ];
 
       virtualisation.fileSystems = {
         "/data" = {
-          device = "/dev/disk/by-label/data";
+          device = "/dev/disk/by-id/virtio-data";
           fsType = "ext4";
+          autoFormat = true;
         };
       };