diff --git a/tests/default.nix b/tests/default.nix
index 3997ac6c..62860060 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -27,8 +27,11 @@ import nmt {
     texlive-minimal = ./modules/programs/texlive-minimal.nix;
     xresources = ./modules/xresources.nix;
   }
-  // pkgs.lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
-    i3-keybindings = ./modules/services/window-managers/i3-keybindings.nix;
-  }
+  // pkgs.lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux (
+    {
+      i3-keybindings = ./modules/services/window-managers/i3-keybindings.nix;
+    }
+    // import ./modules/systemd
+  )
   // import ./modules/programs/ssh;
 }
diff --git a/tests/modules/systemd/default.nix b/tests/modules/systemd/default.nix
new file mode 100644
index 00000000..cc1d5b6b
--- /dev/null
+++ b/tests/modules/systemd/default.nix
@@ -0,0 +1,4 @@
+{
+  systemd-services = ./services.nix;
+  systemd-timers = ./timers.nix;
+}
diff --git a/tests/modules/systemd/services-expected.conf b/tests/modules/systemd/services-expected.conf
new file mode 100644
index 00000000..34b9618d
--- /dev/null
+++ b/tests/modules/systemd/services-expected.conf
@@ -0,0 +1,5 @@
+[Service]
+ExecStart=/some/exec/start/command --with-arguments "%i"
+
+[Unit]
+Description=A basic test service
diff --git a/tests/modules/systemd/services.nix b/tests/modules/systemd/services.nix
new file mode 100644
index 00000000..f1f7a42b
--- /dev/null
+++ b/tests/modules/systemd/services.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    systemd.user.services."test-service@" = {
+      Unit = {
+        Description = "A basic test service";
+      };
+
+      Service = {
+        ExecStart = ''/some/exec/start/command --with-arguments "%i"'';
+      };
+    };
+
+    nmt.script = ''
+      local serviceFile=home-files/.config/systemd/user/test-service@.service
+      assertFileExists $serviceFile
+      assertFileContent $serviceFile ${./services-expected.conf}
+    '';
+  };
+}
diff --git a/tests/modules/systemd/timers-expected.conf b/tests/modules/systemd/timers-expected.conf
new file mode 100644
index 00000000..b19f044c
--- /dev/null
+++ b/tests/modules/systemd/timers-expected.conf
@@ -0,0 +1,8 @@
+[Install]
+WantedBy=timers.target
+
+[Timer]
+OnUnitActiveSec=1h 30m
+
+[Unit]
+Description=A basic test timer
diff --git a/tests/modules/systemd/timers.nix b/tests/modules/systemd/timers.nix
new file mode 100644
index 00000000..0fa0070c
--- /dev/null
+++ b/tests/modules/systemd/timers.nix
@@ -0,0 +1,31 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = {
+    systemd.user.timers.test-timer = {
+      Unit = {
+        Description = "A basic test timer";
+      };
+
+      Timer = {
+        OnUnitActiveSec = "1h 30m";
+      };
+
+      Install = {
+        WantedBy = [ "timers.target" ];
+      };
+    };
+
+    nmt.script = ''
+      local unitDir=home-files/.config/systemd/user
+      local timerFile=$unitDir/test-timer.timer
+
+      assertFileExists $timerFile
+      assertFileContent $timerFile ${./timers-expected.conf}
+
+      assertFileExists $unitDir/timers.target.wants/test-timer.timer
+    '';
+  };
+}