3 files changed, 20 insertions, 3 deletions
diff --git a/tests/aszlig/i3.nix b/tests/aszlig/i3.nix
index e90ff0f4..c6b84b76 100644
--- a/tests/aszlig/i3.nix
+++ b/tests/aszlig/i3.nix
@@ -1,4 +1,6 @@
-import ../make-test.nix ({ pkgs, ... }: {
+{ pkgs, ... }:
+
+{
   name = "i3";
 
   machine = { lib, ... }: {
@@ -26,4 +28,4 @@ import ../make-test.nix ({ pkgs, ... }: {
     $machine->sleep(20);
     $machine->screenshot("i3");
   '';
-})
+}
diff --git a/tests/default.nix b/tests/default.nix
new file mode 100644
index 00000000..96b7da48
--- /dev/null
+++ b/tests/default.nix
@@ -0,0 +1,15 @@
+{ system ? builtins.currentSystem, ... }:
+
+let
+  callTest = path: import ./make-test.nix (import path) {
+    inherit system;
+  };
+
+in {
+  aszlig = {
+    i3 = callTest ./aszlig/i3.nix;
+  };
+  labnet = {
+    heinrich = callTest ./labnet/heinrich.nix;
+  };
+}
diff --git a/tests/labnet/heinrich.nix b/tests/labnet/heinrich.nix
index cacf4267..c195bbdf 100644
--- a/tests/labnet/heinrich.nix
+++ b/tests/labnet/heinrich.nix
@@ -1,4 +1,4 @@
-import ../make-test.nix {
+{
   name = "heinrich";
 
   nodes = let