diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index efc8ceff63858c8bc5ce7e023c605d3e96be8852..c62aab9037b60604d04267ab08fd705d9868348a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,7 +45,7 @@ test:redox:
     variables:
         TARGET: x86_64-unknown-redox
     script:
-        - export CARGO="redoxer"
+        - export CARGO_TEST="redoxer"
         - export RUSTUP_TOOLCHAIN="$HOME/.redoxer/toolchain"
         - export PATH="$RUSTUP_TOOLCHAIN/bin:$PATH"
         - export TEST_RUNNER="redoxer exec --folder . -- sh --"
diff --git a/Makefile b/Makefile
index 177d20bfb415ae538712ef140f46427fea71a9df..5d398dc0d133ebbe61d46e39b8a70b158521cba1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 TARGET?=
 
 CARGO?=cargo
+CARGO_TEST?=$(CARGO)
 CARGOFLAGS=
 RUSTCFLAGS=
 
@@ -88,7 +89,7 @@ sysroot: all
 	touch $@
 
 test: sysroot
-	$(CARGO) test
+	$(CARGO_TEST) test
 	$(MAKE) -C tests verify
 
 # Debug targets