diff --git a/lib/tests.nix b/lib/tests.nix
index e305f4c..752939d 100644
--- a/lib/tests.nix
+++ b/lib/tests.nix
@@ -50,7 +50,7 @@ let
       , bootCommands ? ""
       , extraInstallerConfig ? { }
       , extraSystemConfig ? { }
-      , efi ? true
+      , efi ? !pkgs.hostPlatform.isRiscV64
       , postDisko ? ""
       , testMode ? "module" # can be one of direct module cli
       , testBoot ? true # if we actually want to test booting or just create/mount
diff --git a/tests/default.nix b/tests/default.nix
index b9b516e..250c6e6 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -12,7 +12,9 @@ let
         (x: lib.hasSuffix ".nix" x && x != "default.nix")
         (lib.attrNames (builtins.readDir ./.))
     );
+  incompatibleTests = lib.optionals pkgs.buildPlatform.isRiscV64 [ "zfs" "zfs-over-legacy" "cli" ];
+  allCompatibleFilenames = lib.subtractLists incompatibleTests allTestFilenames;
 
-  allTests = lib.genAttrs allTestFilenames (test: import (./. + "/${test}.nix") { inherit diskoLib pkgs; });
+  allTests = lib.genAttrs allCompatibleFilenames (test: import (./. + "/${test}.nix") { inherit diskoLib pkgs; });
 in
 allTests