diff --git a/nixos-modules/cloud/test.nix b/nixos-modules/cloud/test.nix
index 5dbfa78..386dcba 100644
--- a/nixos-modules/cloud/test.nix
+++ b/nixos-modules/cloud/test.nix
@@ -7,24 +7,25 @@
     { pkgs, lib, ... }:
     let
       inherit (pkgs) curl gnugrep;
-      inherit (lib) mkForce genAttrs const;
+      inherit (lib) mkForce;
+      cloud-domain = "cloud.example.com";
     in
     {
       qois.cloud = {
         enable = true;
-        domain = "cloud.example.com";
+        domain = cloud-domain;
         package = pkgs.nextcloud31;
-        adminpassFile = (pkgs.writeText "nextcloud-test-adminpass-file" "super secret password").outPath;
+        adminpassFile = "${pkgs.writeText "adminpass" "insecure"}"; # Don't try this at home!
       };
 
       qois.postgresql.package = pkgs.postgresql;
       sops.secrets = mkForce { };
 
       # Disable TLS services
-      services.nginx.virtualHosts = genAttrs [ "cloud.example.com" ] (const {
+      services.nginx.virtualHosts."${cloud-domain}" = {
         forceSSL = mkForce false;
         enableACME = mkForce false;
-      });
+      };
 
       # Test environment
       environment.systemPackages = [
diff --git a/nixos-modules/cloud/test.py b/nixos-modules/cloud/test.py
index b7d5cf9..5e484b9 100644
--- a/nixos-modules/cloud/test.py
+++ b/nixos-modules/cloud/test.py
@@ -1,6 +1,8 @@
 def test(subtest, webserver):
     webserver.wait_for_unit("nginx")
     webserver.wait_for_open_port(80)
+    webserver.wait_for_unit("nextcloud-setup.service")
+    webserver.wait_for_unit("phpfpm-nextcloud.service")
 
     # Helpers
     def curl_variable_test(node, variable, expected, url):