3 files changed, 29 insertions, 4 deletions
diff --git a/nixos/tests/fleet.nix b/nixos/tests/fleet.nix
index 4e006c00bee..c60f596b6f5 100644
--- a/nixos/tests/fleet.nix
+++ b/nixos/tests/fleet.nix
@@ -14,7 +14,7 @@ import ./make-test.nix rec {
             };
          };
 
-          virtualisation.fleet = {
+          services.fleet = {
             enable = true;
             metadata.name = "node1";
           };
@@ -34,7 +34,7 @@ import ./make-test.nix rec {
             };
            };
 
-          virtualisation.fleet = {
+          services.fleet = {
             enable = true;
             metadata.name = "node2";
           };
diff --git a/nixos/tests/kubernetes.nix b/nixos/tests/kubernetes.nix
index 3e647026ea4..1ca6153bcb9 100644
--- a/nixos/tests/kubernetes.nix
+++ b/nixos/tests/kubernetes.nix
@@ -48,7 +48,7 @@ import ./make-test.nix rec {
       { config, pkgs, lib, nodes, ... }:
         {
           virtualisation.memorySize = 512;
-          virtualisation.kubernetes = {
+          services.kubernetes = {
             roles = ["master" "node"];
             controllerManager.machines = ["master" "node"];
             kubelet.extraOpts = "-network_container_image=master:5000/pause";
@@ -92,7 +92,7 @@ import ./make-test.nix rec {
     node =
       { config, pkgs, lib, nodes, ... }:
         {
-          virtualisation.kubernetes = {
+          services.kubernetes = {
             roles = ["node"];
             kubelet.extraOpts = "-network_container_image=master:5000/pause";
             verbose = true;
diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix
new file mode 100644
index 00000000000..a2b46d7d284
--- /dev/null
+++ b/nixos/tests/mesos.nix
@@ -0,0 +1,25 @@
+import ./make-test.nix {
+  name = "simple";
+
+  machine = { config, pkgs, ... }: {
+    services.zookeeper.enable = true;
+    virtualistaion.docker.enable = true;
+    services.mesos = {
+      slave = {
+        enable = true;
+        master = "zk://localhost:2181/mesos";
+      };
+      master = {
+        enable = true;
+        zk = "zk://localhost:2181/mesos";
+      };
+    };
+  };
+
+  testScript =
+    ''
+      startAll;
+      $machine->waitForUnit("mesos-master.service");
+      $machine->waitForUnit("mesos-slave.service");
+    '';
+}