diff --git a/release.nix b/release.nix
index 0e0281bf..9a61ee67 100644
--- a/release.nix
+++ b/release.nix
@@ -100,6 +100,8 @@ let
     tests.programs-zsh = makeTest ./tests/programs-zsh.nix;
     tests.services-activate-system = makeTest ./tests/services-activate-system.nix;
     tests.services-buildkite-agent = makeTest ./tests/services-buildkite-agent.nix;
+    tests.services-nix-daemon = makeTest ./tests/services-nix-daemon.nix;
+    tests.sockets-nix-daemon = makeTest ./tests/sockets-nix-daemon.nix;
     tests.services-ofborg = makeTest ./tests/services-ofborg.nix;
     tests.services-offlineimap = makeTest ./tests/services-offlineimap.nix;
     tests.services-skhd = makeTest ./tests/services-skhd.nix;
diff --git a/tests/services-nix-daemon.nix b/tests/services-nix-daemon.nix
new file mode 100644
index 00000000..a03d6a5e
--- /dev/null
+++ b/tests/services-nix-daemon.nix
@@ -0,0 +1,24 @@
+{ config, pkgs, ... }:
+
+let
+  nix = pkgs.runCommand "nix-0.0.0" {} "mkdir -p $out";
+in
+
+{
+  services.nix-daemon.enable = true;
+  nix.package = nix;
+
+  test = ''
+    echo checking nix-daemon service in /Library/LaunchDaemons >&2
+    grep "<string>org.nixos.nix-daemon</string>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist
+    grep "<string>exec ${nix}/bin/nix-daemon</string>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist
+    grep "<key>KeepAlive</key>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist
+    ! grep "<key>Sockets</key>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist
+
+    echo checking nix-daemon reload in /activate >&2
+    grep "pkill -HUP nix-daemon" ${config.out}/activate
+
+    echo checking NIX_REMOTE=daemon in /etc/bashrc >&2
+    grep "NIX_REMOTE=daemon" ${config.out}/etc/bashrc
+  '';
+}
diff --git a/tests/sockets-nix-daemon.nix b/tests/sockets-nix-daemon.nix
new file mode 100644
index 00000000..b83c9bc5
--- /dev/null
+++ b/tests/sockets-nix-daemon.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, ... }:
+
+let
+  nix = pkgs.runCommand "nix-0.0.0" {} "mkdir -p $out";
+in
+
+{
+  services.nix-daemon.enable = true;
+  services.nix-daemon.enableSocketListener = true;
+  nix.package = nix;
+
+  test = ''
+    echo checking nix-daemon service in /Library/LaunchDaemons >&2
+    grep "<string>org.nixos.nix-daemon</string>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist
+    grep "<string>exec ${nix}/bin/nix-daemon</string>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist
+    ! grep "<key>KeepAlive</key>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist
+    grep "<key>Sockets</key>" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist
+    grep "/nix/var/nix/daemon-socket/socket" ${config.out}/Library/LaunchDaemons/org.nixos.nix-daemon.plist
+  '';
+}