diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 99ba0c0a..7fc29663 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -244,7 +244,7 @@ jobs:
           os: ubuntu-24.04
           arch: s390x
           action: test
-          flags: --config=clang --test_timeout=1800
+          flags: --config=clang --define=crypto=system --test_timeout=1800
           # s390x build-tools image built from bazel/external/Dockerfile.bazel
           run_under: docker run --rm --env HOME=$HOME --env USER=$(id -un) --volume "$HOME:$HOME" --workdir $(pwd) --user $(id -u):$(id -g) --platform linux/s390x ghcr.io/proxy-wasm/build-tools:ubuntu-24.04-bazel-7.7.1
           cache: true
diff --git a/bazel/BUILD b/bazel/BUILD
index 58b4aed7..a7054d67 100644
--- a/bazel/BUILD
+++ b/bazel/BUILD
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@bazel_skylib//lib:selects.bzl", "selects")
 load(":v8_transition.bzl", "v8_lib_no_pointer_compression")
 
 package(default_visibility = ["//visibility:public"])
@@ -53,21 +52,8 @@ config_setting(
 )
 
 config_setting(
-    name = "requested_crypto_system",
-    values = {"define": "crypto=system"},
-)
-
-config_setting(
-    name = "linux_s390x",
-    values = {"cpu": "s390x"},
-)
-
-selects.config_setting_group(
     name = "crypto_system",
-    match_any = [
-        ":requested_crypto_system",
-        ":linux_s390x",
-    ],
+    values = {"define": "crypto=system"},
 )
 
 # V8 library with pointer compression disabled using V8's Starlark transition.