diff --git a/pkgs/clan-cli/clan_lib/bwrap/tests/test_bwrap.py b/pkgs/clan-cli/clan_lib/bwrap/tests/test_bwrap.py
index b376e3266..270a69bb8 100644
--- a/pkgs/clan-cli/clan_lib/bwrap/tests/test_bwrap.py
+++ b/pkgs/clan-cli/clan_lib/bwrap/tests/test_bwrap.py
@@ -7,10 +7,3 @@ from clan_lib.bwrap import bubblewrap_works
 @pytest.mark.skipif(sys.platform != "linux", reason="bubblewrap only works on linux")
 def test_bubblewrap_works_on_linux() -> None:
     assert bubblewrap_works() is True
-
-
-@pytest.mark.skipif(
-    sys.platform == "linux", reason="bubblewrap does not work on non-linux"
-)
-def test_bubblewrap_detection_non_linux() -> None:
-    assert bubblewrap_works() is False
diff --git a/pkgs/clan-cli/clan_lib/persist/inventory_store_test.py b/pkgs/clan-cli/clan_lib/persist/inventory_store_test.py
index 06e2bd7e6..79f87a8ef 100644
--- a/pkgs/clan-cli/clan_lib/persist/inventory_store_test.py
+++ b/pkgs/clan-cli/clan_lib/persist/inventory_store_test.py
@@ -39,6 +39,8 @@ class MockFlake:
         output = subprocess.run(
             [
                 "nix",
+                "--extra-experimental-features",
+                "nix-command flakes",
                 "eval",
                 "--impure",
                 "--json",
diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix
index 85ae453f9..1d05db7d0 100644
--- a/pkgs/clan-cli/default.nix
+++ b/pkgs/clan-cli/default.nix
@@ -176,36 +176,7 @@ pythonRuntime.pkgs.buildPythonApplication {
             # limit build cores to 16
             jobs="$((NIX_BUILD_CORES>16 ? 16 : NIX_BUILD_CORES))"
 
-            python -m pytest -m "not impure and not with_core" -n $jobs ./clan_cli/tests
-            touch $out
-          '';
-      clan-lib-pytest-without-core =
-        runCommand "clan-lib-pytest-without-core"
-          {
-            nativeBuildInputs = testDependencies;
-            closureInfo = pkgs.closureInfo {
-              rootPaths = [
-                templateDerivation
-              ];
-            };
-          }
-          ''
-            set -euo pipefail
-            cp -r ${sourceWithTests} ./src
-            chmod +w -R ./src
-            cd ./src
-
-            export NIX_STATE_DIR=$TMPDIR/nix IN_NIX_SANDBOX=1 PYTHONWARNINGS=error
-
-            # required to prevent concurrent 'nix flake lock' operations
-            export CLAN_TEST_STORE=$TMPDIR/store
-            export LOCK_NIX=$TMPDIR/nix_lock
-            mkdir -p "$CLAN_TEST_STORE/nix/store"
-
-            # limit build cores to 16
-            jobs="$((NIX_BUILD_CORES>16 ? 16 : NIX_BUILD_CORES))"
-
-            python -m pytest -m "not impure and not with_core" -n $jobs ./clan_lib
+            python -m pytest -m "not impure and not with_core" -n $jobs ./clan_cli ./clan_lib
             touch $out
           '';
     }