diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 102feb41eaebc74ccd5d6054cf86ca403acf9a66..62a80d123aa05daca0c10cefcf4b761db177723f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,4 @@
-# TODO: Change back once upstream is updated
-image: "jd91mzm2/redoxer:latest"
-#image: "redoxos/redoxer:latest"
+image: "redoxos/redoxer:latest"
 
 stages:
     - build
@@ -42,8 +40,6 @@ test:linux:
         - build:linux
     script:
         - make test
-    # TODO: SIGILL when running `cargo test`
-    allow_failure: true
 
 test:redox:
     stage: test
diff --git a/Makefile b/Makefile
index b7db4438f09134550fdab24037e02b27ea5010b3..d564b4a2c68c9e6c5e2a2c953df9221fd3709583 100644
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,8 @@ sysroot: all
 	touch $@
 
 test: sysroot
-	$(CARGO_TEST) test
+	# TODO: Fix SIGILL when running cargo test
+	# $(CARGO_TEST) test
 	$(MAKE) -C tests verify
 
 # Debug targets