diff --git a/.cargo/config.toml b/.cargo/config.toml
deleted file mode 100644
index 5a227fc4..00000000
--- a/.cargo/config.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-# Cargo seems to expect the -gcc variant instead of -ld
-
-[target.armv7-unknown-linux-gnueabihf]
-linker = "arm-linux-gnueabihf-gcc"
-
-[target.aarch64-unknown-linux-gnu]
-linker = "aarch64-linux-gnu-gcc"
diff --git a/test/cross-compile.sh b/test/cross-compile.sh
index be3ece88..ceb5c3fa 100755
--- a/test/cross-compile.sh
+++ b/test/cross-compile.sh
@@ -18,13 +18,17 @@ export PKG_CONFIG=$(pwd)/test/pkg-config
 export SYSROOT=/tmp/arm-linux-gnueabihf
 # Add the correct libcrypto to the linking process
 export RUSTFLAGS="-lcrypto -L/tmp/arm-linux-gnueabihf/lib"
-cargo build --features "pkcs11-provider, mbed-crypto-provider, tpm-provider, unix-peer-credentials-authenticator, direct-authenticator" --target armv7-unknown-linux-gnueabihf
+cargo build --features "pkcs11-provider, mbed-crypto-provider, tpm-provider, unix-peer-credentials-authenticator, direct-authenticator" \
+	--target armv7-unknown-linux-gnueabihf \
+	--config 'target.armv7-unknown-linux-gnueabihf.linker="arm-linux-gnueabihf-gcc"'
 
 export SYSROOT=/tmp/aarch64-linux-gnu
 export RUSTFLAGS="-lcrypto -L/tmp/aarch64-linux-gnu/lib"
 # Pull in the TS code
 git submodule update --init
-cargo build --features "pkcs11-provider, mbed-crypto-provider, tpm-provider, trusted-service-provider, unix-peer-credentials-authenticator, direct-authenticator" --target aarch64-unknown-linux-gnu
+cargo build --features "pkcs11-provider, mbed-crypto-provider, tpm-provider, trusted-service-provider, unix-peer-credentials-authenticator, direct-authenticator" \
+	--target aarch64-unknown-linux-gnu \
+	--config 'target.aarch64-unknown-linux-gnu.linker="aarch64-linux-gnu-gcc"'
 
 # This is needed because for some reason the i686/i386 libs aren't picked up if we don't toss them around just before...
 apt install -y libc6-dev-i386-amd64-cross