diff --git a/.npmrc b/.npmrc
index 031ab1810a..498143e355 100644
--- a/.npmrc
+++ b/.npmrc
@@ -2,6 +2,7 @@ independent-leaves = true
 link-workspace-packages = true
 save-exact = true
 shared-workspace-lockfile = true
+use-beta-cli = true
 
 ; Temporarily commenting out.
 ; peer dependencies should be resolved from dependencies of the root workspace package
diff --git a/privatePackages/assert-project/test/fixture/.npmrc b/privatePackages/assert-project/test/fixture/.npmrc
deleted file mode 100644
index b8e9c6e4e4..0000000000
--- a/privatePackages/assert-project/test/fixture/.npmrc
+++ /dev/null
@@ -1,3 +0,0 @@
-; This config file may be removed
-; if the workaround with pnpm-workspace.yaml won't be needed
-shared-workspace-lockfile = false
diff --git a/privatePackages/assert-project/test/fixture/project/.npmrc b/privatePackages/assert-project/test/fixture/project/.npmrc
index 36e5edbad7..5fc8805059 100644
--- a/privatePackages/assert-project/test/fixture/project/.npmrc
+++ b/privatePackages/assert-project/test/fixture/project/.npmrc
@@ -1 +1,4 @@
+; This config file may be removed
+; if the workaround with pnpm-workspace.yaml won't be needed
+shared-workspace-lockfile = false
 store=../store
diff --git a/privatePackages/assert-project/test/fixture/pnpm-workspace.yaml b/privatePackages/assert-project/test/fixture/project/pnpm-workspace.yaml
similarity index 94%
rename from privatePackages/assert-project/test/fixture/pnpm-workspace.yaml
rename to privatePackages/assert-project/test/fixture/project/pnpm-workspace.yaml
index e61ffa6ca6..7072b5d173 100644
--- a/privatePackages/assert-project/test/fixture/pnpm-workspace.yaml
+++ b/privatePackages/assert-project/test/fixture/project/pnpm-workspace.yaml
@@ -1,3 +1,4 @@
 # This is only created so that the test package doesn't try to use the virtual store from the repo's root
 packages:
+  - "."
   - "!store/**"
diff --git a/privatePackages/assert-store/test/fixture/.npmrc b/privatePackages/assert-store/test/fixture/.npmrc
deleted file mode 100644
index b8e9c6e4e4..0000000000
--- a/privatePackages/assert-store/test/fixture/.npmrc
+++ /dev/null
@@ -1,3 +0,0 @@
-; This config file may be removed
-; if the workaround with pnpm-workspace.yaml won't be needed
-shared-workspace-lockfile = false
diff --git a/privatePackages/assert-store/test/fixture/project/.npmrc b/privatePackages/assert-store/test/fixture/project/.npmrc
index 36e5edbad7..5fc8805059 100644
--- a/privatePackages/assert-store/test/fixture/project/.npmrc
+++ b/privatePackages/assert-store/test/fixture/project/.npmrc
@@ -1 +1,4 @@
+; This config file may be removed
+; if the workaround with pnpm-workspace.yaml won't be needed
+shared-workspace-lockfile = false
 store=../store
diff --git a/privatePackages/assert-store/test/fixture/pnpm-workspace.yaml b/privatePackages/assert-store/test/fixture/project/pnpm-workspace.yaml
similarity index 94%
rename from privatePackages/assert-store/test/fixture/pnpm-workspace.yaml
rename to privatePackages/assert-store/test/fixture/project/pnpm-workspace.yaml
index e61ffa6ca6..c89a6eee98 100644
--- a/privatePackages/assert-store/test/fixture/pnpm-workspace.yaml
+++ b/privatePackages/assert-store/test/fixture/project/pnpm-workspace.yaml
@@ -1,3 +1,4 @@
 # This is only created so that the test package doesn't try to use the virtual store from the repo's root
 packages:
+  - '.'
   - "!store/**"
diff --git a/privatePackages/assert-store/test/fixture/project/shrinkwrap.yaml b/privatePackages/assert-store/test/fixture/project/shrinkwrap.yaml
deleted file mode 100644
index 6d53505593..0000000000
--- a/privatePackages/assert-store/test/fixture/project/shrinkwrap.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-dependencies:
-  is-positive: 3.1.0
-packages:
-  /is-positive/3.1.0:
-    dev: false
-    engines:
-      node: '>=0.10.0'
-    resolution:
-      integrity: sha1-hX21hKG6XRyymAUn/DtsQ103sP0=
-registry: 'https://registry.npmjs.org/'
-shrinkwrapMinorVersion: 9
-shrinkwrapVersion: 3
-specifiers:
-  is-positive: 3.1.0