diff --git a/tests/modules/services/redshift-gammastep/default.nix b/tests/modules/services/redshift-gammastep/default.nix
index 78251059..c6db8a8a 100644
--- a/tests/modules/services/redshift-gammastep/default.nix
+++ b/tests/modules/services/redshift-gammastep/default.nix
@@ -1,4 +1,6 @@
 {
   gammastep-basic-configuration = ./gammastep-basic-configuration.nix;
+  gammastep-tray-configuration = ./gammastep-tray-configuration.nix;
   redshift-basic-configuration = ./redshift-basic-configuration.nix;
+  redshift-tray-configuration = ./redshift-tray-configuration.nix;
 }
diff --git a/tests/modules/services/redshift-gammastep/gammastep-tray-configuration-expected.service b/tests/modules/services/redshift-gammastep/gammastep-tray-configuration-expected.service
new file mode 100644
index 00000000..fde728de
--- /dev/null
+++ b/tests/modules/services/redshift-gammastep/gammastep-tray-configuration-expected.service
@@ -0,0 +1,15 @@
+[Install]
+WantedBy=graphical-session.target
+
+[Service]
+ExecStart=@gammastep@/bin/gammastep-indicator -c /home/hm-user/.config/gammastep/config.ini
+Restart=on-failure
+RestartSec=3
+
+[Unit]
+After=graphical-session.target
+After=tray.target
+Description=Gammastep colour temperature adjuster
+Documentation=https://gitlab.com/chinstrap/gammastep/
+PartOf=graphical-session.target
+Requires=tray.target
diff --git a/tests/modules/services/redshift-gammastep/gammastep-tray-configuration.nix b/tests/modules/services/redshift-gammastep/gammastep-tray-configuration.nix
new file mode 100644
index 00000000..e408f9cc
--- /dev/null
+++ b/tests/modules/services/redshift-gammastep/gammastep-tray-configuration.nix
@@ -0,0 +1,25 @@
+{
+  services.gammastep = {
+    enable = true;
+    provider = "manual";
+    dawnTime = "6:00-7:45";
+    duskTime = "18:35-20:15";
+    settings = {
+      general = {
+        adjustment-method = "randr";
+        gamma = 0.8;
+      };
+      randr = { screen = 0; };
+    };
+    tray = true;
+  };
+
+  nmt.script = ''
+    assertFileContent \
+        home-files/.config/gammastep/config.ini \
+        ${./gammastep-basic-configuration-file-expected.conf}
+    assertFileContent \
+        home-files/.config/systemd/user/gammastep.service \
+        ${./gammastep-tray-configuration-expected.service}
+  '';
+}
diff --git a/tests/modules/services/redshift-gammastep/redshift-tray-configuration-expected.service b/tests/modules/services/redshift-gammastep/redshift-tray-configuration-expected.service
new file mode 100644
index 00000000..db4b11c3
--- /dev/null
+++ b/tests/modules/services/redshift-gammastep/redshift-tray-configuration-expected.service
@@ -0,0 +1,15 @@
+[Install]
+WantedBy=graphical-session.target
+
+[Service]
+ExecStart=@redshift@/bin/redshift-gtk -c /home/hm-user/.config/redshift/redshift.conf
+Restart=on-failure
+RestartSec=3
+
+[Unit]
+After=graphical-session.target
+After=tray.target
+Description=Redshift colour temperature adjuster
+Documentation=http://jonls.dk/redshift/
+PartOf=graphical-session.target
+Requires=tray.target
diff --git a/tests/modules/services/redshift-gammastep/redshift-tray-configuration.nix b/tests/modules/services/redshift-gammastep/redshift-tray-configuration.nix
new file mode 100644
index 00000000..332bb819
--- /dev/null
+++ b/tests/modules/services/redshift-gammastep/redshift-tray-configuration.nix
@@ -0,0 +1,25 @@
+{
+  services.redshift = {
+    enable = true;
+    provider = "manual";
+    latitude = 0.0;
+    longitude = "0.0";
+    settings = {
+      redshift = {
+        adjustment-method = "randr";
+        gamma = 0.8;
+      };
+      randr = { screen = 0; };
+    };
+    tray = true;
+  };
+
+  nmt.script = ''
+    assertFileContent \
+        home-files/.config/redshift/redshift.conf \
+        ${./redshift-basic-configuration-file-expected.conf}
+    assertFileContent \
+        home-files/.config/systemd/user/redshift.service \
+        ${./redshift-tray-configuration-expected.service}
+  '';
+}