diff --git a/modules/emacs/testbeds/emacs.nix b/modules/emacs/testbeds/emacs.nix
index 22433683..6693970c 100644
--- a/modules/emacs/testbeds/emacs.nix
+++ b/modules/emacs/testbeds/emacs.nix
@@ -1,17 +1,11 @@
 { lib, pkgs, ... }:
-let
-  package = pkgs.emacs;
-in
 {
-  stylix.testbed.ui.application = {
-    name = "emacs";
-    inherit package;
-  };
+  stylix.testbed.ui.command.text = "emacs flake-parts/flake.nix";
 
   home-manager.sharedModules = lib.singleton {
     programs.emacs = {
       enable = true;
-      inherit package;
+      package = pkgs.emacs;
     };
   };
 }
diff --git a/modules/gedit/testbeds/gedit.nix b/modules/gedit/testbeds/gedit.nix
index 34979d48..3d988d60 100644
--- a/modules/gedit/testbeds/gedit.nix
+++ b/modules/gedit/testbeds/gedit.nix
@@ -1,12 +1,5 @@
 { pkgs, ... }:
-let
-  package = pkgs.gedit;
-in
 {
-  stylix.testbed.ui.application = {
-    name = "org.gnome.gedit";
-    inherit package;
-  };
-
-  environment.systemPackages = [ package ];
+  stylix.testbed.ui.command.text = "gedit flake-parts/flake.nix";
+  environment.systemPackages = [ pkgs.gedit ];
 }
diff --git a/modules/gnome-text-editor/testbeds/gnome-text-editor.nix b/modules/gnome-text-editor/testbeds/gnome-text-editor.nix
index 7950740e..2022e2b2 100644
--- a/modules/gnome-text-editor/testbeds/gnome-text-editor.nix
+++ b/modules/gnome-text-editor/testbeds/gnome-text-editor.nix
@@ -1,12 +1,5 @@
 { pkgs, ... }:
-let
-  package = pkgs.gnome-text-editor;
-in
 {
-  stylix.testbed.ui.application = {
-    name = "org.gnome.TextEditor";
-    inherit package;
-  };
-
-  environment.systemPackages = [ package ];
+  stylix.testbed.ui.command.text = "gnome-text-editor flake-parts/flake.nix";
+  environment.systemPackages = [ pkgs.gnome-text-editor ];
 }
diff --git a/modules/neovim/testbeds/neovide.nix b/modules/neovim/testbeds/neovide.nix
index aee8acfd..bbbabc6b 100644
--- a/modules/neovim/testbeds/neovide.nix
+++ b/modules/neovim/testbeds/neovide.nix
@@ -1,18 +1,12 @@
 { lib, pkgs, ... }:
-let
-  package = pkgs.neovide;
-in
 {
-  stylix.testbed.ui.application = {
-    name = "neovide";
-    inherit package;
-  };
+  stylix.testbed.ui.command.text = "neovide flake-parts/flake.nix";
 
   home-manager.sharedModules = lib.singleton {
     programs = {
       neovide = {
         enable = true;
-        inherit package;
+        package = pkgs.neovide;
       };
       neovim.enable = true;
     };
diff --git a/modules/vscode/testbeds/vscode.nix b/modules/vscode/testbeds/vscode.nix
index 6ba6593e..06308854 100644
--- a/modules/vscode/testbeds/vscode.nix
+++ b/modules/vscode/testbeds/vscode.nix
@@ -1,18 +1,13 @@
 { lib, pkgs, ... }:
-# We are using VSCodium because VSCode is an unfree package
-let
-  package = pkgs.vscodium;
-in
 {
-  stylix.testbed.ui.application = {
-    name = "codium";
-    inherit package;
-  };
+  stylix.testbed.ui.command.text = "codium flake-parts/flake.nix";
 
   home-manager.sharedModules = lib.singleton {
     programs.vscode = {
       enable = true;
-      inherit package;
+
+      # We are using VSCodium because VSCode is an unfree package
+      package = pkgs.vscodium;
     };
   };
 }