diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 582ba9fd4..3da15bade 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,13 @@
-image: debian
+image: debian:testing
 
 before_script:
   - dpkg --add-architecture i386
+  - dpkg --add-architecture arm64
   - apt-get update -qq
   - apt-get install -y
-      libc6-dev:amd64 libc6-dev:i386 gcc make
-      gcc-aarch64-linux-gnu libc-dev-arm64-cross
+      libc6-dev:amd64 gcc make
+      gcc-i686-linux-gnu libc6-dev-i386-cross libc6:i386
+      gcc-aarch64-linux-gnu libc6-dev-arm64-cross libc6:arm64
 
 x86-64:
   stage: test
@@ -15,9 +17,9 @@ x86-64:
 i686:
   stage: test
   script:
-    - make -C tests test-ia32 CC_IA32='gcc -m32'
+    - make -C tests test-ia32 CC_IA32=i686-linux-gnu-gcc
 
 aarch64:
   stage: test
   script:
-    - make -C tests test-aarch64 CC_AARCH64=gcc-aarch64-linux-gnu
+    - make -C tests test-aarch64 CC_AARCH64=aarch64-linux-gnu-gcc