diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml
index 5b25fe714..08f722884 100644
--- a/.github/workflows/CICD.yml
+++ b/.github/workflows/CICD.yml
@@ -1093,12 +1093,11 @@ jobs:
       shell: bash
       run: |
         sudo apt-get -y update ; sudo apt-get -y install libselinux1-dev
-    - name: Build coreutils as multiple binaries
+    - name: Build coreutils
       shell: bash
       run: |
-        ## Build individual uutil binaries
         set -v
-        make
+        make MULTICALL=y && (cd target/debug && for binary in $(./coreutils --list);do ln -sf coreutils ${binary};done)
     - name: Run toybox src
       shell: bash
       run: |
diff --git a/GNUmakefile b/GNUmakefile
index 57b160332..ae266b6c2 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,4 +1,4 @@
-# spell-checker:ignore (misc) testsuite runtest findstring (targets) busytest toybox distclean pkgs nextest ; (vars/env) BINDIR BUILDDIR CARGOFLAGS DESTDIR DOCSDIR INSTALLDIR INSTALLEES MULTICALL DATAROOTDIR TESTDIR manpages
+# spell-checker:ignore (misc) testsuite runtest findstring (targets) busytest toybox distclean pkgs nextest ; (vars/env) BINDIR BUILDDIR CARGOFLAGS CFLAGS DESTDIR DOCSDIR INSTALLDIR INSTALLEES MULTICALL DATAROOTDIR TESTDIR manpages
 
 # Config options
 ifneq (,$(filter install, $(MAKECMDGOALS)))
@@ -170,7 +170,7 @@ nextest:
 	${CARGO} nextest run ${CARGOFLAGS} --features "$(TESTS) $(TEST_SPEC_FEATURE)" $(PROFILE_CMD) --no-default-features $(TEST_NO_FAIL_FAST)
 
 test_toybox:
-	-(cd $(TOYBOX_SRC)/ && make tests)
+	-(cd $(TOYBOX_SRC)/ && CFLAGS="-pipe -O0 -s" make tests)
 
 toybox-src:
 	if [ ! -e "$(TOYBOX_SRC)" ] ; then \