diff --git a/debian/default.nix b/debian/default.nix
index 986f855..341f23d 100644
--- a/debian/default.nix
+++ b/debian/default.nix
@@ -6,10 +6,10 @@ let
     url = image.name;
   };
   images = lib.mapAttrs (k: v: fetchImage v) imagesJSON.${system};
-  makeVmTestForImage = image: { testScript, sharedDirs, diskSize ? null }: generic.makeVmTest {
-    inherit system testScript sharedDirs;
+  makeVmTestForImage = image: { testScript, sharedDirs, diskSize ? null, extraPathsToRegister ? [ ], machineConfigModule ? generic.defaultMachineConfigModule }: generic.makeVmTest {
+    inherit system testScript sharedDirs machineConfigModule;
     image = prepareDebianImage {
-      inherit diskSize;
+      inherit diskSize extraPathsToRegister;
       hostPkgs = pkgs;
       originalImage = image;
     };
diff --git a/fedora/default.nix b/fedora/default.nix
index dbebb85..34f813b 100644
--- a/fedora/default.nix
+++ b/fedora/default.nix
@@ -6,8 +6,8 @@ let
     url = "https://download.fedoraproject.org/pub/fedora/linux/releases/${image.name}";
   };
   images = lib.mapAttrs (k: v: fetchImage v) (imagesJSON.${system} or {});
-  makeVmTestForImage = image: { testScript, sharedDirs, diskSize ? null, extraPathsToRegister ? [ ]}: generic.makeVmTest {
-    inherit system testScript sharedDirs;
+  makeVmTestForImage = image: { testScript, sharedDirs, diskSize ? null, extraPathsToRegister ? [ ], machineConfigModule ? generic.defaultMachineConfigModule }: generic.makeVmTest {
+    inherit system testScript sharedDirs machineConfigModule;
     image = prepareFedoraImage {
       inherit diskSize extraPathsToRegister;
       hostPkgs = pkgs;
diff --git a/ubuntu/default.nix b/ubuntu/default.nix
index 6cc5097..a946cca 100644
--- a/ubuntu/default.nix
+++ b/ubuntu/default.nix
@@ -6,8 +6,8 @@ let
     url = image.name;
   };
   images = lib.mapAttrs (k: v: fetchImage v) imagesJSON.${system};
-  makeVmTestForImage = image: { testScript, sharedDirs, diskSize ? null, extraPathsToRegister ? [ ] }: generic.makeVmTest {
-    inherit system testScript sharedDirs;
+  makeVmTestForImage = image: { testScript, sharedDirs, diskSize ? null, extraPathsToRegister ? [ ], machineConfigModule ? generic.defaultMachineConfigModule }: generic.makeVmTest {
+    inherit system testScript sharedDirs machineConfigModule;
     image = prepareUbuntuImage {
       inherit diskSize extraPathsToRegister;
       hostPkgs = pkgs;