diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ad5cd610b2f398a8b29d8a13d35c4fb8a97b863..d15adad01ad2999f891bc94fbdc507b3861da2db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,12 +7,13 @@
 
 before_script:
   - case "$CI_BUILD_NAME" in
-      *-clang) export CXX=clang++ EXTRA_PKGS="$EXTRA_PKGS clang";;
+      *-clang) export CXX=clang++ EXTRA_PKGS="$EXTRA_PKGS clang@edge2";;
       *) export CXX=g++;;
     esac
   - export JOBS=$(grep -c processor /proc/cpuinfo)
-  # XXX: Remove after Alpine v3.6 is released and rename tclap-dev@edge to tclap-dev.
+  # XXX: Remove after Alpine v3.6 is released and rename tclap-dev@edge to tclap-dev and clang@edge2 to clang.
   - echo '@edge http://repository.fit.cvut.cz/mirrors/alpine/edge/community' >> /etc/apk/repositories
+  - echo '@edge2 http://repository.fit.cvut.cz/mirrors/alpine/edge/main' >> /etc/apk/repositories
   - apk add --no-cache build-base bash libexecinfo-dev
         cppunit-dev libxml2-dev tclap-dev@edge $EXTRA_PKGS