diff --git a/_test/pubspec.yaml b/_test/pubspec.yaml
index ec5ac4173..74954b46a 100644
--- a/_test/pubspec.yaml
+++ b/_test/pubspec.yaml
@@ -1,9 +1,6 @@
 name: _test
 publish_to: none
-# This package can't be part of the workspace because it needs to use the local
-# build_web_compilers, which also isn't part of the workspace. See the top-
-# level pubspec for details.
-#resolution: workspace
+resolution: workspace
 
 environment:
   sdk: ^3.6.0
@@ -29,21 +26,3 @@ dev_dependencies:
   test: ^1.16.0
   test_descriptor: ^2.0.1
   test_process: ^2.0.0
-
-dependency_overrides:
-  build:
-    path: ../build
-  build_config:
-    path: ../build_config
-  build_modules:
-    path: ../build_modules
-  build_resolvers:
-    path: ../build_resolvers
-  build_runner:
-    path: ../build_runner
-  build_runner_core:
-    path: ../build_runner_core
-  build_test:
-    path: ../build_test
-  build_web_compilers:
-    path: ../build_web_compilers
diff --git a/_test_common/pubspec.yaml b/_test_common/pubspec.yaml
index f52fca1ac..a3112703b 100644
--- a/_test_common/pubspec.yaml
+++ b/_test_common/pubspec.yaml
@@ -1,7 +1,7 @@
 name: _test_common
 publish_to: none
 description: Test infra for writing build tests. Is not published.
-#resolution: workspace
+resolution: workspace
 
 environment:
   sdk: ^3.5.0
@@ -22,13 +22,3 @@ dependencies:
 
 dev_dependencies:
   dart_flutter_team_lints: ^3.1.0
-
-dependency_overrides:
-  build:
-    path: ../build
-  build_config:
-    path: ../build_config
-  build_runner_core:
-    path: ../build_runner_core
-  build_test:
-    path: ../build_test
diff --git a/build/pubspec.yaml b/build/pubspec.yaml
index 5a9b7a8da..2db10a482 100644
--- a/build/pubspec.yaml
+++ b/build/pubspec.yaml
@@ -3,9 +3,7 @@ version: 2.4.2-wip
 description: A package for authoring build_runner compatible code generators.
 repository: https://github.com/dart-lang/build/tree/master/build
 
-# This package can't be part of the workspace because it requires a very recent
-# Dart SDK - see the top-level pubspec for details.
-#resolution: workspace
+resolution: workspace
 
 environment:
   sdk: ^3.6.0-228.0.dev
@@ -27,10 +25,6 @@ dev_dependencies:
   dart_flutter_team_lints: ^3.1.0
   test: ^1.16.0
 
-dependency_overrides:
-  build_resolvers:
-    path: ../build_resolvers
-
 topics:
  - build-runner
  - codegen
diff --git a/build_resolvers/pubspec.yaml b/build_resolvers/pubspec.yaml
index d93fe44ec..5b8ec66cf 100644
--- a/build_resolvers/pubspec.yaml
+++ b/build_resolvers/pubspec.yaml
@@ -2,10 +2,7 @@ name: build_resolvers
 version: 2.4.3-wip
 description: Resolve Dart code in a Builder
 repository: https://github.com/dart-lang/build/tree/master/build_resolvers
-
-# This package can't be part of the workspace because it requires a very recent
-# Dart SDK - see the top-level pubspec for details.
-#resolution: workspace
+resolution: workspace
 
 environment:
   sdk: ^3.6.0
diff --git a/build_runner/pubspec.yaml b/build_runner/pubspec.yaml
index 084ce1c9d..6e26269b1 100644
--- a/build_runner/pubspec.yaml
+++ b/build_runner/pubspec.yaml
@@ -2,7 +2,7 @@ name: build_runner
 version: 2.4.14-wip
 description: A build system for Dart code generation and modular compilation.
 repository: https://github.com/dart-lang/build/tree/master/build_runner
-#resolution: workspace
+resolution: workspace
 
 environment:
   sdk: ^3.6.0
@@ -59,17 +59,5 @@ dev_dependencies:
   test_descriptor: ^2.0.0
   test_process: ^2.0.0
 
-dependency_overrides:
-  build:
-    path: ../build
-  build_modules:
-    path: ../build_modules
-  build_resolvers:
-    path: ../build_resolvers
-  build_runner_core:
-    path: ../build_runner_core
-  build_web_compilers:
-    path: ../build_web_compilers
-
 topics:
  - build-runner
diff --git a/build_runner_core/pubspec.yaml b/build_runner_core/pubspec.yaml
index 1cccc0b70..04362925b 100644
--- a/build_runner_core/pubspec.yaml
+++ b/build_runner_core/pubspec.yaml
@@ -2,10 +2,7 @@ name: build_runner_core
 version: 8.0.0-wip
 description: Core tools to organize the structure of a build and run Builders.
 repository: https://github.com/dart-lang/build/tree/master/build_runner_core
-
-# This package can't be part of the workspace because it requires a very recent
-# Dart SDK - see the top-level pubspec for details.
-#resolution: workspace
+resolution: workspace
 
 environment:
   sdk: ^3.6.0
@@ -49,7 +46,3 @@ dev_dependencies:
 
 topics:
  - build-runner
-
-dependency_overrides:
-  build_runner:
-    path: ../build_runner
diff --git a/build_web_compilers/pubspec.yaml b/build_web_compilers/pubspec.yaml
index 03816936e..309140366 100644
--- a/build_web_compilers/pubspec.yaml
+++ b/build_web_compilers/pubspec.yaml
@@ -2,9 +2,7 @@ name: build_web_compilers
 version: 4.1.0-wip
 description: Builder implementations wrapping the dart2js and DDC compilers.
 repository: https://github.com/dart-lang/build/tree/master/build_web_compilers
-# This package can't be part of the workspace because it requires a very recent
-# Dart SDK - see the top-level pubspec for details.
-#resolution: workspace
+resolution: workspace
 
 environment:
   sdk: '>=3.6.0 <3.7.0-z'
@@ -42,10 +40,5 @@ dev_dependencies:
   test: ^1.16.0
   yaml: ^3.1.0
 
-# TODO: remove once this package is back in the workspace
-dependency_overrides:
-  build_modules:
-    path: ../build_modules
-
 topics:
  - build-runner
diff --git a/pubspec.yaml b/pubspec.yaml
index 93db16236..5e1f12b10 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -12,18 +12,18 @@ dev_dependencies:
 # needs to use all packages from the repository) can't be part of the
 # workspace.
 workspace:
-#- _test
-#- _test/pkgs/provides_builder
-#- _test_common
-# - build
+- _test
+- _test/pkgs/provides_builder
+- _test_common
+- build
 - build_config
 - build_daemon
 - build_modules
-# - build_resolvers
-#- build_runner
-# - build_runner_core
+- build_resolvers
+- build_runner
+- build_runner_core
 - build_test
-#- build_web_compilers
+- build_web_compilers
 - example
 - scratch_space
 - tool