diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix
index 0772c05d12ac..e268eb573808 100644
--- a/nixos/tests/mpd.nix
+++ b/nixos/tests/mpd.nix
@@ -1,12 +1,13 @@
-import ./make-test-python.nix ({ pkgs, lib, ... }:
+import ./make-test-python.nix (
+  { pkgs, lib, ... }:
   let
     track = pkgs.fetchurl {
       # Sourced from http://freemusicarchive.org/music/Blue_Wave_Theory/Surf_Music_Month_Challenge/Skyhawk_Beach_fade_in
-      # License: http://creativecommons.org/licenses/by-sa/4.0/
 
       name = "Blue_Wave_Theory-Skyhawk_Beach.mp3";
       url = "https://freemusicarchive.org/file/music/ccCommunity/Blue_Wave_Theory/Surf_Music_Month_Challenge/Blue_Wave_Theory_-_04_-_Skyhawk_Beach.mp3";
-      sha256 = "0xw417bxkx4gqqy139bb21yldi37xx8xjfxrwaqa0gyw19dl6mgp";
+      hash = "sha256-91VDWwrcP6Cw4rk72VHvZ8RGfRBrpRE8xo/02dcJhHc=";
+      meta.license = lib.licenses.cc-by-sa-40;
     };
 
     defaultCfg = rec {
@@ -16,42 +17,56 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
       musicDirectory = "${dataDir}/music";
     };
 
-    defaultMpdCfg = with defaultCfg; {
-      inherit dataDir musicDirectory user group;
+    defaultMpdCfg = {
+      inherit (defaultCfg)
+        dataDir
+        musicDirectory
+        user
+        group
+        ;
       enable = true;
     };
 
-    musicService = { user, group, musicDirectory }: {
-      description = "Sets up the music file(s) for MPD to use.";
-      requires = [ "mpd.service" ];
-      after = [ "mpd.service" ];
-      wantedBy = [ "default.target" ];
-      script = ''
-        cp ${track} ${musicDirectory}
-      '';
-      serviceConfig = {
-        User = user;
-        Group = group;
+    musicService =
+      {
+        user,
+        group,
+        musicDirectory,
+      }:
+      {
+        description = "Sets up the music file(s) for MPD to use.";
+        requires = [ "mpd.service" ];
+        after = [ "mpd.service" ];
+        wantedBy = [ "default.target" ];
+        script = ''
+          cp ${track} ${musicDirectory}
+        '';
+        serviceConfig = {
+          User = user;
+          Group = group;
+        };
       };
-    };
 
-    mkServer = { mpd, musicService, }:
-      { boot.kernelModules = [ "snd-dummy" ];
+    mkServer =
+      { mpd, musicService }:
+      {
+        boot.kernelModules = [ "snd-dummy" ];
         services.mpd = mpd;
         systemd.services.musicService = musicService;
       };
-  in {
+  in
+  {
     name = "mpd";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [ emmanuelrosa ];
+    meta = {
+      maintainers = with lib.maintainers; [ emmanuelrosa ];
     };
 
-  nodes =
-    { client =
-      { ... }: { };
+    nodes = {
+      client = { ... }: { };
 
       serverALSA =
-        { ... }: lib.mkMerge [
+        { ... }:
+        lib.mkMerge [
           (mkServer {
             mpd = defaultMpdCfg // {
               network.listenAddress = "any";
@@ -63,13 +78,14 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
                 }
               '';
             };
-            musicService = with defaultMpdCfg; musicService { inherit user group musicDirectory; };
+            musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; };
           })
           { networking.firewall.allowedTCPPorts = [ 6600 ]; }
         ];
 
       serverPulseAudio =
-        { ... }: lib.mkMerge [
+        { ... }:
+        lib.mkMerge [
           (mkServer {
             mpd = defaultMpdCfg // {
               extraConfig = ''
@@ -80,7 +96,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
               '';
             };
 
-            musicService = with defaultCfg; musicService { inherit user group musicDirectory; };
+            musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; };
           })
           {
             hardware.pulseaudio = {
@@ -94,40 +110,41 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
         ];
     };
 
-  testScript = ''
-    mpc = "${pkgs.mpc-cli}/bin/mpc --wait"
+    testScript = ''
+      mpc = "${lib.getExe pkgs.mpc} --wait"
 
-    # Connects to the given server and attempts to play a tune.
-    def play_some_music(server):
-        server.wait_for_unit("mpd.service")
-        server.succeed(f"{mpc} update")
-        _, tracks = server.execute(f"{mpc} ls")
+      # Connects to the given server and attempts to play a tune.
+      def play_some_music(server):
+          server.wait_for_unit("mpd.service")
+          server.succeed(f"{mpc} update")
+          _, tracks = server.execute(f"{mpc} ls")
 
-        for track in tracks.splitlines():
-            server.succeed(f"{mpc} add {track}")
+          for track in tracks.splitlines():
+              server.succeed(f"{mpc} add {track}")
 
-        _, added_tracks = server.execute(f"{mpc} playlist")
+          _, added_tracks = server.execute(f"{mpc} playlist")
 
-        # Check we succeeded adding audio tracks to the playlist
-        assert len(added_tracks.splitlines()) > 0
+          # Check we succeeded adding audio tracks to the playlist
+          assert len(added_tracks.splitlines()) > 0
 
-        server.succeed(f"{mpc} play")
+          server.succeed(f"{mpc} play")
 
-        _, output = server.execute(f"{mpc} status")
-        # Assure audio track is playing
-        assert "playing" in output
+          _, output = server.execute(f"{mpc} status")
+          # Assure audio track is playing
+          assert "playing" in output
 
-        server.succeed(f"{mpc} stop")
+          server.succeed(f"{mpc} stop")
 
 
-    play_some_music(serverALSA)
-    play_some_music(serverPulseAudio)
+      play_some_music(serverALSA)
+      play_some_music(serverPulseAudio)
 
-    client.wait_for_unit("multi-user.target")
-    client.succeed(f"{mpc} -h serverALSA status")
+      client.wait_for_unit("multi-user.target")
+      client.succeed(f"{mpc} -h serverALSA status")
 
-    # The PulseAudio-based server is configured not to accept external client connections
-    # to perform the following test:
-    client.fail(f"{mpc} -h serverPulseAudio status")
-  '';
-})
+      # The PulseAudio-based server is configured not to accept external client connections
+      # to perform the following test:
+      client.fail(f"{mpc} -h serverPulseAudio status")
+    '';
+  }
+)