diff --git a/release.nix b/release.nix
index 06f1a4470844..ab2122aa02a1 100644
--- a/release.nix
+++ b/release.nix
@@ -256,7 +256,8 @@ in {
       mysql = runTest (t: t.mysql.test);
       mysql_replication = runTest (t: t.mysql_replication.test);
       nat = runTest (t: t.nat.test);
-      nfs = runTest (t: t.nfs.test);
+      nfs3 = runTest (t: t.nfs3.test);
+      #nfs4 = runTest (t: t.nfs4.test);
       openssh = runTest (t: t.openssh.test);
       partition = runTest (t: t.partition.test);
       proxy = runTest (t: t.proxy.test);
diff --git a/tests/default.nix b/tests/default.nix
index 798fdf9817a9..0822c93e81ee 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -17,7 +17,8 @@ with import ../lib/testing.nix { inherit system minimal; };
   mysql = makeTest (import ./mysql.nix);
   mysql_replication = makeTest (import ./mysql-replication.nix);
   nat = makeTest (import ./nat.nix);
-  nfs = makeTest (import ./nfs.nix);
+  nfs3 = makeTest (import ./nfs.nix { version = 3; });
+  nfs4 = makeTest (import ./nfs.nix { version = 4; });
   openssh = makeTest (import ./openssh.nix);
   partition = makeTest (import ./partition.nix);
   portmap = makeTest (import ./portmap.nix);
diff --git a/tests/nfs.nix b/tests/nfs.nix
index 4690b9e67aeb..ee65c298dd00 100644
--- a/tests/nfs.nix
+++ b/tests/nfs.nix
@@ -1,3 +1,5 @@
+{ version }:
+
 { pkgs, ... }:
 
 let
@@ -6,9 +8,9 @@ let
     { config, pkgs, ... }:
     { fileSystems = pkgs.lib.mkOverride 50
         [ { mountPoint = "/data";
-            device = "server:/data";
+            device = "server:${if version == 4 then "/" else "/data"}";
             fsType = "nfs";
-            options = "vers=3";
+            options = "vers=${toString version}";
           }
         ];
     };