diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16ae9420e45..3ea9fc4f9d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -448,7 +448,7 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &arm64_test "2021-02-17-remove-pytest"
+    MESA_IMAGE_TAG: &arm64_test "2021-02-17-piglit-dependencies"
 
 .use-arm64_test:
   extends:
@@ -465,7 +465,7 @@ armhf_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &armhf_test "2021-02-17-remove-pytest"
+    MESA_IMAGE_TAG: &armhf_test "2021-02-17-piglit-dependencies"
 
 .use-armhf_test:
   extends:
diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh
index 3d6215cf444..6fc750315df 100644
--- a/.gitlab-ci/container/create-rootfs.sh
+++ b/.gitlab-ci/container/create-rootfs.sh
@@ -18,12 +18,25 @@ elif [ $DEBIAN_ARCH = amd64 ]; then
 fi
 
 if [ -n "$INCLUDE_PIGLIT" ]; then
-    PIGLIT_PACKAGES="libwaffle-1-0
+    PIGLIT_PACKAGES="libpython3.7
+                     libwaffle-1-0
+                     libx11-6
+                     libx11-xcb1
+                     libxcb-glx0
+                     libxcb-shm0
+                     libxdamage1
+                     libxext6
+                     libxfixes3
                      libxkbcommon0
+                     libxxf86vm1
+                     python3
                      python3-lxml
                      python3-mako
                      python3-numpy
+                     python3-pil
+                     python3-requests
                      python3-simplejson
+                     python3-yaml
                     "
     INSTALL_CI_FAIRY_PACKAGES="git
                                python3-dev
@@ -44,31 +57,16 @@ apt-get -y install --no-install-recommends \
     initramfs-tools \
     libexpat1 \
     libpng16-16 \
-    libpython3.7 \
     libsensors5 \
     libvulkan1 \
-    libwaffle-1-0 \
-    libx11-6 \
-    libx11-xcb1 \
     libxcb-dri2-0 \
     libxcb-dri3-0 \
-    libxcb-glx0 \
     libxcb-present0 \
     libxcb-randr0 \
-    libxcb-shm0 \
     libxcb-sync1 \
     libxcb-xfixes0 \
-    libxdamage1 \
-    libxext6 \
-    libxfixes3 \
-    libxkbcommon0 \
     libxshmfence1 \
-    libxxf86vm1 \
     netcat-openbsd \
-    python3 \
-    python3-pil \
-    python3-requests \
-    python3-yaml \
     sntp \
     strace \
     wget \
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index e33bc4d2905..d2670d8c014 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  MESA_LAVA_TAG: "2020-02-17-remove-pytest"
+  MESA_LAVA_TAG: "2020-02-17-piglit-dependencies"
 
 .kernel+rootfs:
   stage: container-2