diff --git a/tests/functional/flakes/commit-lock-file-summary.sh b/tests/functional/flakes/commit-lock-file-summary.sh
new file mode 100644
index 000000000..21504eb21
--- /dev/null
+++ b/tests/functional/flakes/commit-lock-file-summary.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+
+source ./common.sh
+
+TODO_NixOS
+
+requireGit
+
+flake1Dir=$TEST_ROOT/flake1
+lockfileSummaryFlake=$TEST_ROOT/lockfileSummaryFlake
+
+createGitRepo "$flake1Dir" ""
+createSimpleGitFlake "$flake1Dir"
+nix registry add --registry "$registry" flake1 "git+file://$flake1Dir"
+
+createGitRepo "$lockfileSummaryFlake" "--initial-branch=main"
+
+# Test that the --commit-lock-file-summary flag and its alias work
+cat > "$lockfileSummaryFlake/flake.nix" <<EOF
+{
+  inputs = {
+    flake1.url = "git+file://$flake1Dir";
+  };
+
+  description = "lockfileSummaryFlake";
+
+  outputs = inputs: rec {
+    packages.$system.default = inputs.flake1.packages.$system.foo;
+  };
+}
+EOF
+
+git -C "$lockfileSummaryFlake" add flake.nix
+git -C "$lockfileSummaryFlake" commit -m 'Add lockfileSummaryFlake'
+
+testSummary="test summary 1"
+nix flake lock "$lockfileSummaryFlake" --commit-lock-file --commit-lock-file-summary "$testSummary"
+[[ -e "$lockfileSummaryFlake/flake.lock" ]]
+[[ -z $(git -C "$lockfileSummaryFlake" diff main || echo failed) ]]
+[[ "$(git -C "$lockfileSummaryFlake" log --format=%s -n 1)" = "$testSummary" ]]
+
+git -C "$lockfileSummaryFlake" rm :/:flake.lock
+git -C "$lockfileSummaryFlake" commit -m "remove flake.lock"
+testSummary="test summary 2"
+# NOTE(cole-h): We use `--option` here because Nix settings do not currently support flag-ifying the
+# alias of a setting: https://github.com/NixOS/nix/issues/10989
+nix flake lock "$lockfileSummaryFlake" --commit-lock-file --option commit-lockfile-summary "$testSummary"
+[[ -e "$lockfileSummaryFlake/flake.lock" ]]
+[[ -z $(git -C "$lockfileSummaryFlake" diff main || echo failed) ]]
+[[ "$(git -C "$lockfileSummaryFlake" log --format=%s -n 1)" = "$testSummary" ]]
diff --git a/tests/functional/flakes/flakes.sh b/tests/functional/flakes/flakes.sh
index 2b503df02..6718e2370 100755
--- a/tests/functional/flakes/flakes.sh
+++ b/tests/functional/flakes/flakes.sh
@@ -19,17 +19,13 @@ flake7Dir=$TEST_ROOT/flake7
 nonFlakeDir=$TEST_ROOT/nonFlake
 badFlakeDir=$TEST_ROOT/badFlake
 flakeGitBare=$TEST_ROOT/flakeGitBare
-lockfileSummaryFlake=$TEST_ROOT/lockfileSummaryFlake
 
-for repo in "$flake1Dir" "$flake2Dir" "$flake3Dir" "$flake7Dir" "$nonFlakeDir" "$lockfileSummaryFlake"; do
+for repo in "$flake1Dir" "$flake2Dir" "$flake3Dir" "$flake7Dir" "$nonFlakeDir"; do
     # Give one repo a non-main initial branch.
     extraArgs=
     if [[ "$repo" == "$flake2Dir" ]]; then
       extraArgs="--initial-branch=main"
     fi
-    if [[ "$repo" == "$lockfileSummaryFlake" ]]; then
-      extraArgs="--initial-branch=main"
-    fi
 
     createGitRepo "$repo" "$extraArgs"
 done
@@ -552,37 +548,3 @@ nix flake metadata "$flake2Dir" --reference-lock-file $TEST_ROOT/flake2-overridd
 
 # reference-lock-file can only be used if allow-dirty is set.
 expectStderr 1 nix flake metadata "$flake2Dir" --no-allow-dirty --reference-lock-file $TEST_ROOT/flake2-overridden.lock
-
-# Test that the --commit-lock-file-summary flag and its alias work
-cat > "$lockfileSummaryFlake/flake.nix" <<EOF
-{
-  inputs = {
-    flake1.url = "git+file://$flake1Dir";
-  };
-
-  description = "lockfileSummaryFlake";
-
-  outputs = inputs: rec {
-    packages.$system.default = inputs.flake1.packages.$system.foo;
-  };
-}
-EOF
-
-git -C "$lockfileSummaryFlake" add flake.nix
-git -C "$lockfileSummaryFlake" commit -m 'Add lockfileSummaryFlake'
-
-testSummary="test summary 1"
-nix flake lock "$lockfileSummaryFlake" --commit-lock-file --commit-lock-file-summary "$testSummary"
-[[ -e "$lockfileSummaryFlake/flake.lock" ]]
-[[ -z $(git -C "$lockfileSummaryFlake" diff main || echo failed) ]]
-[[ "$(git -C "$lockfileSummaryFlake" log --format=%s -n 1)" = "$testSummary" ]]
-
-git -C "$lockfileSummaryFlake" rm :/:flake.lock
-git -C "$lockfileSummaryFlake" commit -m "remove flake.lock"
-testSummary="test summary 2"
-# NOTE(cole-h): We use `--option` here because Nix settings do not currently support flag-ifying the
-# alias of a setting: https://github.com/NixOS/nix/issues/10989
-nix flake lock "$lockfileSummaryFlake" --commit-lock-file --option commit-lockfile-summary "$testSummary"
-[[ -e "$lockfileSummaryFlake/flake.lock" ]]
-[[ -z $(git -C "$lockfileSummaryFlake" diff main || echo failed) ]]
-[[ "$(git -C "$lockfileSummaryFlake" log --format=%s -n 1)" = "$testSummary" ]]
diff --git a/tests/functional/flakes/meson.build b/tests/functional/flakes/meson.build
index 902eed130..a646abc00 100644
--- a/tests/functional/flakes/meson.build
+++ b/tests/functional/flakes/meson.build
@@ -25,6 +25,7 @@ suites += {
     'show.sh',
     'dubious-query.sh',
     'shebang.sh',
+    'commit-lock-file-summary.sh',
   ],
   'workdir': meson.current_source_dir(),
 }