diff --git a/.github/workflows/test_cpp.yml b/.github/workflows/test_cpp.yml
index 71583a48a1..854f93484c 100644
--- a/.github/workflows/test_cpp.yml
+++ b/.github/workflows/test_cpp.yml
@@ -34,7 +34,7 @@ jobs:
             version: Bazel7
             image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-cf84e92285ca133b9c8104ad7b14d70e953cbb8e"
             targets: "//src/... //third_party/utf8_range/..."
-          - config: { name: "Bazel7 with Bzlmod", flags: --enable_bzlmod }
+          - config: { name: "Bazel7 with Bzlmod", flags: --enable_bzlmod --enable_workspace }
             version: Bazel7bzlmod
             image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-cf84e92285ca133b9c8104ad7b14d70e953cbb8e"
             targets: "//src/... //third_party/utf8_range/..."
diff --git a/.github/workflows/test_java.yml b/.github/workflows/test_java.yml
index 9762ddc94b..64639b9d31 100644
--- a/.github/workflows/test_java.yml
+++ b/.github/workflows/test_java.yml
@@ -40,7 +40,7 @@ jobs:
             version: 'bazel7bzlmod'
             image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.1.2-cf84e92285ca133b9c8104ad7b14d70e953cbb8e
             targets: //java/... //java/internal:java_version //compatibility/...
-            flags: --enable_bzlmod
+            flags: --enable_bzlmod --enable_workspace
           - name: aarch64
             version: 'aarch64'
             image: us-docker.pkg.dev/protobuf-build/containers/test/linux/emulation:aarch64-63dd26c0c7a808d92673a3e52e848189d4ab0f17
diff --git a/python/requirements.txt b/python/requirements.txt
index d568cc581e..dd0ac27ce2 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -1,2 +1,2 @@
 numpy<=1.26.1
-setuptools<=68.2.2
+setuptools<=70.3.0