diff --git a/nix/configuration/configuration.nix b/nix/configuration/configuration.nix
index 894d47b..0b591ca 100644
--- a/nix/configuration/configuration.nix
+++ b/nix/configuration/configuration.nix
@@ -54,6 +54,7 @@
     ./roles/wasm
     ./roles/vnc_client
     ./roles/chromecast
+    ./roles/memtest86
   ];
 
   nix.settings.experimental-features = [
diff --git a/nix/configuration/roles/memtest86/default.nix b/nix/configuration/roles/memtest86/default.nix
new file mode 100644
index 0000000..f552ba2
--- /dev/null
+++ b/nix/configuration/roles/memtest86/default.nix
@@ -0,0 +1,17 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [ ];
+  config = lib.mkMerge [
+    { }
+    (lib.mkIf (config.me.buildingIso) {
+      # boot.loader.systemd-boot.memtest86.enable = true;
+      boot.loader.grub.memtest86.enable = true;
+    })
+  ];
+}