diff --git a/default.nix b/default.nix
index bdb4ee032..62c7741d1 100644
--- a/default.nix
+++ b/default.nix
@@ -79,6 +79,12 @@ let
         examples = lib.mapAttrs (
           _: project: lib.mapAttrs (_: example: example.module) project.nixos.examples
         ) self.hydrated-projects;
+        demos = lib.mapAttrs (
+            _: project: lib.filterAttrs (_: v: v != null) {
+              vm = project.nixos.demo.vm.module or null;
+              shell = project.nixos.demo.shell.module or null;
+            }
+          ) self.hydrated-projects;
       };
     };
 
diff --git a/projects/Teamtype/default.nix b/projects/Teamtype/default.nix
index 045cf003c..3b035cdee 100644
--- a/projects/Teamtype/default.nix
+++ b/projects/Teamtype/default.nix
@@ -34,11 +34,6 @@
       module = ./programs/teamtype/module.nix;
       examples."Enable Teamtype" = {
         module = ./programs/teamtype/examples/basic.nix;
-        tests.basic.module = import ./programs/teamtype/tests/basic.nix args;
-        tests.basic.problem.broken.reason = ''
-          Needs a self-hosted relay server to work non-interactively (without internet).
-          Requires: https://github.com/teamtype/teamtype/issues/344
-        '';
       };
     };
   };
diff --git a/projects/Teamtype/programs/teamtype/tests/basic.nix b/projects/Teamtype/programs/teamtype/tests/basic.nix
index 1ff64476b..4abf1103d 100644
--- a/projects/Teamtype/programs/teamtype/tests/basic.nix
+++ b/projects/Teamtype/programs/teamtype/tests/basic.nix
@@ -21,7 +21,7 @@
         imports = [
           sources.modules.ngipkgs
           sources.modules.programs.teamtype
-          sources.examples.Teamtype."Enable Teamtype"
+          sources.demos.Teamtype.shell
         ];
         services.getty.autologinUser = "root";
       };