diff --git a/tests/default.nix b/tests/default.nix
index 6adee16a..18ec9ab1 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -182,6 +182,7 @@ import nmt {
     ./modules/services/syncthing
     ./modules/services/trayer
     ./modules/services/twmn
+    ./modules/services/udiskie
     ./modules/services/window-managers/bspwm
     ./modules/services/window-managers/herbstluftwm
     ./modules/services/window-managers/i3
diff --git a/tests/modules/services/udiskie/basic.nix b/tests/modules/services/udiskie/basic.nix
new file mode 100644
index 00000000..5fa623c3
--- /dev/null
+++ b/tests/modules/services/udiskie/basic.nix
@@ -0,0 +1,15 @@
+{
+  config = {
+    services.udiskie.enable = true;
+
+    test.stubs.udiskie = { };
+
+    nmt.script = ''
+      serviceFile="home-files/.config/systemd/user/udiskie.service"
+      assertFileRegex "$serviceFile" 'After=tray\.target'
+      assertFileRegex "$serviceFile" 'Requires=tray\.target'
+      assertFileContent "home-files/.config/udiskie/config.yml" \
+          ${./basic.yml}
+    '';
+  };
+}
diff --git a/tests/modules/services/udiskie/basic.yml b/tests/modules/services/udiskie/basic.yml
new file mode 100644
index 00000000..423f4ec8
--- /dev/null
+++ b/tests/modules/services/udiskie/basic.yml
@@ -0,0 +1,4 @@
+program_options:
+  automount: true
+  notify: true
+  tray: auto
diff --git a/tests/modules/services/udiskie/default.nix b/tests/modules/services/udiskie/default.nix
new file mode 100644
index 00000000..b79be5a9
--- /dev/null
+++ b/tests/modules/services/udiskie/default.nix
@@ -0,0 +1,4 @@
+{
+  udiskie-basic = ./basic.nix;
+  udiskie-no-tray = ./no-tray.nix;
+}
diff --git a/tests/modules/services/udiskie/no-tray.nix b/tests/modules/services/udiskie/no-tray.nix
new file mode 100644
index 00000000..0c7ede0b
--- /dev/null
+++ b/tests/modules/services/udiskie/no-tray.nix
@@ -0,0 +1,18 @@
+{
+  config = {
+    services.udiskie = {
+      enable = true;
+      tray = "never";
+    };
+
+    test.stubs.udiskie = { };
+
+    nmt.script = ''
+      serviceFile="home-files/.config/systemd/user/udiskie.service"
+      assertFileNotRegex "$serviceFile" 'After=tray\.target'
+      assertFileNotRegex "$serviceFile" 'Requires=tray\.target'
+      assertFileContent "home-files/.config/udiskie/config.yml" \
+          ${./no-tray.yml}
+    '';
+  };
+}
diff --git a/tests/modules/services/udiskie/no-tray.yml b/tests/modules/services/udiskie/no-tray.yml
new file mode 100644
index 00000000..75eca2ff
--- /dev/null
+++ b/tests/modules/services/udiskie/no-tray.yml
@@ -0,0 +1,4 @@
+program_options:
+  automount: true
+  notify: true
+  tray: false