4 files changed, 1 insertions, 24 deletions
diff --git a/lib/tests/flakes/subflakeTest/flake.nix b/lib/tests/flakes/subflakeTest/flake.nix
deleted file mode 100644
index 3a8edd5e8c508..0000000000000
--- a/lib/tests/flakes/subflakeTest/flake.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  outputs = { self, subflake, callLocklessFlake }: rec {
-    x = (callLocklessFlake {
-      path = subflake;
-      inputs = {};
-    }).subflakeOutput;
-  };
-}
diff --git a/lib/tests/flakes/subflakeTest/subflake/flake.nix b/lib/tests/flakes/subflakeTest/subflake/flake.nix
deleted file mode 100644
index 41566b52090cc..0000000000000
--- a/lib/tests/flakes/subflakeTest/subflake/flake.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  outputs = { self }: {
-    subflakeOutput = 1;
-  };
-}
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index c7010f41394a0..1154edf1de628 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -22,16 +22,6 @@ in
 
 runTests {
 
-# FLAKES
-
-  testCallLocklessFlake = {
-    expr = callLocklessFlake {
-      path = ./flakes/subflakeTest;
-      inputs = { subflake = ./flakes/subflakeTest/subflake; inherit callLocklessFlake; };
-    };
-    expected = { x = 1; outPath = ./flakes/subflakeTest; };
-  };
-
 # TRIVIAL
 
   testId = {
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index c7b8bbbf8c799..487fcd93641b8 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -315,7 +315,7 @@ checkConfigOutput "bar" config.priorities ./raw.nix
 
 ## Option collision
 checkConfigError \
-  'The option .set. in module .*/declare-set.nix. would be a parent of the following options, but its type .attribute set of signed integers. does not support nested options.\n\s*- option[(]s[)] with prefix .set.enable. in module .*/declare-enable-nested.nix.' \
+  'The option .set. in module .*/declare-set.nix. would be a parent of the following options, but its type .attribute set of signed integer. does not support nested options.\n\s*- option[(]s[)] with prefix .set.enable. in module .*/declare-enable-nested.nix.' \
   config.set \
   ./declare-set.nix ./declare-enable-nested.nix