diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml
index 0f91bbf851..5d53d34061 100644
--- a/.github/workflows/CICD.yml
+++ b/.github/workflows/CICD.yml
@@ -505,12 +505,13 @@ jobs:
       fail-fast: false
       matrix:
         job:
-          # - { os , target , cargo-options , features , use-cross , toolchain, skip-tests }
+          # - { os , target , cargo-options , features , use-cross , toolchain, skip-tests, workspace-tests }
           - { os: ubuntu-latest  , target: arm-unknown-linux-gnueabihf , features: feat_os_unix_gnueabihf , use-cross: use-cross , skip-tests: true }
           - { os: ubuntu-24.04-arm  , target: aarch64-unknown-linux-gnu   , features: feat_os_unix_gnueabihf }
           - { os: ubuntu-latest  , target: aarch64-unknown-linux-musl  , features: feat_os_unix_musl      , use-cross: use-cross , skip-tests: true }
           # - { os: ubuntu-latest  , target: x86_64-unknown-linux-gnu    , features: feat_selinux           , use-cross: use-cross }
           - { os: ubuntu-latest  , target: i686-unknown-linux-gnu      , features: "feat_os_unix,test_risky_names", use-cross: use-cross }
+          - { os: ubuntu-latest  , target: i686-unknown-linux-gnu      , features: "feat_os_unix"         , use-cross: no, workspace-tests: true }
           - { os: ubuntu-latest  , target: i686-unknown-linux-musl     , features: feat_os_unix_musl      , use-cross: use-cross }
           - { os: ubuntu-latest  , target: x86_64-unknown-linux-gnu    , features: "feat_os_unix,test_risky_names", use-cross: use-cross }
           - { os: ubuntu-latest  , target: x86_64-unknown-linux-musl   , features: feat_os_unix_musl      , use-cross: use-cross }
@@ -624,6 +625,13 @@ jobs:
         esac
         outputs CARGO_CMD
         outputs CARGO_CMD_OPTIONS
+        CARGO_TEST_OPTIONS=''
+        case '${{ matrix.job.workspace-tests }}' in
+          ''|1|t|true|y|yes)
+            CARGO_TEST_OPTIONS='--workspace'
+            ;;
+        esac
+        outputs CARGO_TEST_OPTIONS
         # ** pass needed environment into `cross` container (iff `cross` not already configured via "Cross.toml")
         if [ "${CARGO_CMD}" = 'cross' ] && [ ! -e "Cross.toml" ] ; then
           printf "[build.env]\npassthrough = [\"CI\", \"RUST_BACKTRACE\", \"CARGO_TERM_COLOR\"]\n" > Cross.toml
@@ -740,7 +748,7 @@ jobs:
       shell: bash
       run: |
         ## Test
-        ${{ steps.vars.outputs.CARGO_CMD }} ${{ steps.vars.outputs.CARGO_CMD_OPTIONS }} test --workspace --target=${{ matrix.job.target }} \
+        ${{ steps.vars.outputs.CARGO_CMD }} ${{ steps.vars.outputs.CARGO_CMD_OPTIONS }} test --target=${{ matrix.job.target }} \
         ${{ steps.vars.outputs.CARGO_TEST_OPTIONS}} ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }}
       env:
         RUST_BACKTRACE: "1"
diff --git a/Cross.toml b/Cross.toml
deleted file mode 100644
index 216650905e..0000000000
--- a/Cross.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-# spell-checker:ignore dpkg
-
-[build]
-default-target = "x86_64-unknown-linux-gnu"
-pre-build = [
-    "dpkg --add-architecture $CROSS_DEB_ARCH",
-    "apt-get update && apt-get --assume-yes install libselinux1-dev:$CROSS_DEB_ARCH libclang-dev:$CROSS_DEB_ARCH"
-]