diff --git a/weldr-client.spec b/weldr-client.spec
index 1893f91..3baa328 100644
--- a/weldr-client.spec
+++ b/weldr-client.spec
@@ -7,7 +7,7 @@
 
 Name:      weldr-client
 Version:   35.3
-Release:   2%{?dist}
+Release:   3%{?dist}
 # Upstream license specification: Apache-2.0
 License:   ASL 2.0
 Summary:   Command line utility to control osbuild-composer
@@ -83,8 +83,8 @@ export BUILDTAGS="integration"
 # On Fedora, also turn off go modules and set the path to the one into which
 # the golang-* packages install source code.
 %if 0%{?rhel}
-export LDFLAGS="${LDFLAGS:-} -buildmode pie -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
-go test -c -tags=integration -ldflags="${LDFLAGS}" -o composer-cli-tests %{goipath}/weldr
+export LDFLAGS="${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(od -N 20 -An -tx1 -w100 /dev/urandom | tr -d ' ')"
+go test -c -tags=integration -buildmode pie -compiler gc -ldflags="${LDFLAGS}" -o composer-cli-tests %{goipath}/weldr
 %else
 make GOBUILDFLAGS="%{gobuildflags}" integration
 %endif
@@ -131,6 +131,10 @@ composer-cli package.
 
 
 %changelog
+* Wed Oct 06 2021 Brian C. Lane <bcl@redhat.com> - 35.3-3
+- Add more of the go build flags to composer-cli-test build cmdline
+  Related: rhbz#2010519
+
 * Tue Oct 05 2021 Brian C. Lane <bcl@redhat.com> - 35.3-2
 - Add -buildmode pie to composer-cli-tests LDFLAGS
   Related: rhbz#2010519