diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ee46683c95f93ade459634edd53363e880d4be6..628873551f959d0205198db1da08ce4fbd5f53cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,8 @@ stages:
 
 before_script:
     - git submodule update --init --recursive
-    - rustup target add x86_64-unknown-redox --toolchain nightly
+    - rustup toolchain add "$(cat rust-toolchain)"
+    - rustup target add x86_64-unknown-redox --toolchain "$(cat rust-toolchain)"
     - rustup show      # Print version info for debugging
 
 cache:
@@ -17,10 +18,22 @@ build:linux:
     script:
         - make all
 
-#build:redox:
-#    stage: build
-#    script:
-#        - make all
+build:redox:
+    stage: build
+    variables:
+        TARGET: x86_64-unknown-redox
+    script:
+        # Install x86_64-unknown-redox-gcc
+        # This can't be in before_script because that overrides
+        # the global before_script.
+        - apt-get update -qq
+        - apt-get install -qq apt-transport-https build-essential curl git gnupg software-properties-common
+        - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AA12E97F0881517F
+        - add-apt-repository 'deb https://static.redox-os.org/toolchain/apt /'
+        - apt-get update -qq && apt-get install -qq x86-64-unknown-redox-gcc
+
+        # Main script
+        - make all
 
 test:linux:
     stage: test
@@ -28,6 +41,7 @@ test:linux:
         - build:linux
     script:
         - make test
+        - cd tests && make verify
 
 fmt:
     stage: test
diff --git a/tests/expected/wchar/mbrtowc.stdout b/tests/expected/wchar/mbrtowc.stdout
index a82952475af7dc5b2832bb62325c3677f6ddd63e..ae1d1cd6f9abcd8ba435cfd8efe9960655aeb1ae 100644
--- a/tests/expected/wchar/mbrtowc.stdout
+++ b/tests/expected/wchar/mbrtowc.stdout
@@ -1,2 +1,2 @@
 Processing 11 UTF-8 code units: [ 7a c3 9f e6 b0 b4 f0 9f 8d 8c 0 ]
-into 5 wchar_t units: [ 7a df 6c34 1f34c 0 ]
\ No newline at end of file
+into 5 wchar_t units: [ 7a df 6c34 1f34c 0 ]