diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 42014f52aab8..5fa3651e0ccb 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -593,7 +593,6 @@ in
           environment.LD_LIBRARY_PATH = nssModulesPath;
 
           serviceConfig = {
-            Type = "notify";
             ExecStart = lib.concatStringsSep " " [
               "-${lib.getExe' cfg.package "sshd"}"
               "-i"
@@ -618,7 +617,6 @@ in
           restartTriggers = [ config.environment.etc."ssh/sshd_config".source ];
 
           serviceConfig = {
-            Type = "notify";
             Restart = "always";
             ExecStart = lib.concatStringsSep " " [
               (lib.getExe' cfg.package "sshd")
diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix
index 92829001f2dd..7d53aaf9c4d5 100644
--- a/nixos/tests/openssh.nix
+++ b/nixos/tests/openssh.nix
@@ -274,5 +274,8 @@ in {
             "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server-no-pam true",
             timeout=30
         )
+
+    # None of the per-connection units should have failed.
+    server_lazy.fail("systemctl is-failed 'sshd@*.service'")
   '';
 })