diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2
index 512a6a9..b357b14 100644
--- a/Dockerfiles/work/Dockerfile-5.2
+++ b/Dockerfiles/work/Dockerfile-5.2
@@ -101,6 +101,7 @@ RUN set -x \
 		whois \
 		wkhtmltopdf \
 		xz-utils \
+		yarn \
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/*
diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3
index 56ec5c7..b3c336c 100644
--- a/Dockerfiles/work/Dockerfile-5.3
+++ b/Dockerfiles/work/Dockerfile-5.3
@@ -147,7 +147,6 @@ RUN set -x \
 && rm -rf /usr/local/src/drush7/docs \
 && rm -rf /usr/local/src/drush7/examples \
 && rm -rf /usr/local/src/drush7/misc \
-&& rm -rf /usr/local/src/drush7/tests \
  \
 # gitflow
 	&& git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \
diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4
index 8351f04..2a5dce2 100644
--- a/Dockerfiles/work/Dockerfile-5.4
+++ b/Dockerfiles/work/Dockerfile-5.4
@@ -150,7 +150,6 @@ RUN set -x \
 && rm -rf /usr/local/src/drush7/docs \
 && rm -rf /usr/local/src/drush7/examples \
 && rm -rf /usr/local/src/drush7/misc \
-&& rm -rf /usr/local/src/drush7/tests \
  \
 # drush8
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush8 \
@@ -164,7 +163,6 @@ RUN set -x \
 && rm -rf /usr/local/src/drush8/docs \
 && rm -rf /usr/local/src/drush8/examples \
 && rm -rf /usr/local/src/drush8/misc \
-&& rm -rf /usr/local/src/drush8/tests \
  \
 # gitflow
 	&& git clone git://github.com/petervanderdoes/gitflow.git /tmp/gitflow \
diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5
index dd4b35e..21af6b1 100644
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -154,7 +154,6 @@ RUN set -x \
 && rm -rf /usr/local/src/drush7/docs \
 && rm -rf /usr/local/src/drush7/examples \
 && rm -rf /usr/local/src/drush7/misc \
-&& rm -rf /usr/local/src/drush7/tests \
  \
 # drush8
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush8 \
@@ -168,7 +167,6 @@ RUN set -x \
 && rm -rf /usr/local/src/drush8/docs \
 && rm -rf /usr/local/src/drush8/examples \
 && rm -rf /usr/local/src/drush8/misc \
-&& rm -rf /usr/local/src/drush8/tests \
  \
 # drupalconsole
 	&& curl https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \
diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6
index fa95a78..b89c2dc 100644
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -154,7 +154,6 @@ RUN set -x \
 && rm -rf /usr/local/src/drush7/docs \
 && rm -rf /usr/local/src/drush7/examples \
 && rm -rf /usr/local/src/drush7/misc \
-&& rm -rf /usr/local/src/drush7/tests \
  \
 # drush8
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush8 \
@@ -168,7 +167,6 @@ RUN set -x \
 && rm -rf /usr/local/src/drush8/docs \
 && rm -rf /usr/local/src/drush8/examples \
 && rm -rf /usr/local/src/drush8/misc \
-&& rm -rf /usr/local/src/drush8/tests \
  \
 # drush9
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush9 \
@@ -182,7 +180,6 @@ RUN set -x \
 && rm -rf /usr/local/src/drush9/docs \
 && rm -rf /usr/local/src/drush9/examples \
 && rm -rf /usr/local/src/drush9/misc \
-&& rm -rf /usr/local/src/drush9/tests \
  \
 # drupalconsole
 	&& curl https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \
diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0
index a8dfb41..671f6d5 100644
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -154,7 +154,6 @@ RUN set -x \
 && rm -rf /usr/local/src/drush7/docs \
 && rm -rf /usr/local/src/drush7/examples \
 && rm -rf /usr/local/src/drush7/misc \
-&& rm -rf /usr/local/src/drush7/tests \
  \
 # drush8
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush8 \
@@ -168,7 +167,6 @@ RUN set -x \
 && rm -rf /usr/local/src/drush8/docs \
 && rm -rf /usr/local/src/drush8/examples \
 && rm -rf /usr/local/src/drush8/misc \
-&& rm -rf /usr/local/src/drush8/tests \
  \
 # drush9
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush9 \
@@ -182,7 +180,6 @@ RUN set -x \
 && rm -rf /usr/local/src/drush9/docs \
 && rm -rf /usr/local/src/drush9/examples \
 && rm -rf /usr/local/src/drush9/misc \
-&& rm -rf /usr/local/src/drush9/tests \
  \
 # drupalconsole
 	&& curl https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \
diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1
index df1a2e1..8ec19af 100644
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -154,7 +154,6 @@ RUN set -x \
 && rm -rf /usr/local/src/drush7/docs \
 && rm -rf /usr/local/src/drush7/examples \
 && rm -rf /usr/local/src/drush7/misc \
-&& rm -rf /usr/local/src/drush7/tests \
  \
 # drush8
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush8 \
@@ -168,7 +167,6 @@ RUN set -x \
 && rm -rf /usr/local/src/drush8/docs \
 && rm -rf /usr/local/src/drush8/examples \
 && rm -rf /usr/local/src/drush8/misc \
-&& rm -rf /usr/local/src/drush8/tests \
  \
 # drush9
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush9 \
@@ -182,7 +180,6 @@ RUN set -x \
 && rm -rf /usr/local/src/drush9/docs \
 && rm -rf /usr/local/src/drush9/examples \
 && rm -rf /usr/local/src/drush9/misc \
-&& rm -rf /usr/local/src/drush9/tests \
  \
 # drupalconsole
 	&& curl https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \
diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2
index fbd7178..485b1a4 100644
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -154,7 +154,6 @@ RUN set -x \
 && rm -rf /usr/local/src/drush7/docs \
 && rm -rf /usr/local/src/drush7/examples \
 && rm -rf /usr/local/src/drush7/misc \
-&& rm -rf /usr/local/src/drush7/tests \
  \
 # drush8
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush8 \
@@ -168,7 +167,6 @@ RUN set -x \
 && rm -rf /usr/local/src/drush8/docs \
 && rm -rf /usr/local/src/drush8/examples \
 && rm -rf /usr/local/src/drush8/misc \
-&& rm -rf /usr/local/src/drush8/tests \
  \
 # drush9
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush9 \
@@ -182,7 +180,6 @@ RUN set -x \
 && rm -rf /usr/local/src/drush9/docs \
 && rm -rf /usr/local/src/drush9/examples \
 && rm -rf /usr/local/src/drush9/misc \
-&& rm -rf /usr/local/src/drush9/tests \
  \
 # drupalconsole
 	&& curl https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \
diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3
index c71812e..f710d37 100644
--- a/Dockerfiles/work/Dockerfile-7.3
+++ b/Dockerfiles/work/Dockerfile-7.3
@@ -154,7 +154,6 @@ RUN set -x \
 && rm -rf /usr/local/src/drush7/docs \
 && rm -rf /usr/local/src/drush7/examples \
 && rm -rf /usr/local/src/drush7/misc \
-&& rm -rf /usr/local/src/drush7/tests \
  \
 # drush8
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush8 \
@@ -168,7 +167,6 @@ RUN set -x \
 && rm -rf /usr/local/src/drush8/docs \
 && rm -rf /usr/local/src/drush8/examples \
 && rm -rf /usr/local/src/drush8/misc \
-&& rm -rf /usr/local/src/drush8/tests \
  \
 # drush9
 	&& git clone https://github.com/drush-ops/drush.git /usr/local/src/drush9 \
@@ -182,7 +180,6 @@ RUN set -x \
 && rm -rf /usr/local/src/drush9/docs \
 && rm -rf /usr/local/src/drush9/examples \
 && rm -rf /usr/local/src/drush9/misc \
-&& rm -rf /usr/local/src/drush9/tests \
  \
 # drupalconsole
 	&& curl https://drupalconsole.com/installer -L -o /usr/local/bin/drupal \
diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2
index b6182ea..5dfd3f7 100644
--- a/build/ansible/DOCKERFILES/Dockerfile-work.j2
+++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2
@@ -122,9 +122,7 @@ RUN set -x \
 		whois \
 		wkhtmltopdf \
 		xz-utils \
-{% if php_version != 5.2 %}
 		yarn \
-{% endif %}
 		zsh \
 	&& DEBIAN_FRONTEND=noninteractive apt-get purge -qq -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false apt-utils \
 	&& rm -rf /var/lib/apt/lists/*
diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml
index 37c71d6..f415580 100644
--- a/build/ansible/group_vars/all.yml
+++ b/build/ansible/group_vars/all.yml
@@ -358,7 +358,6 @@ software_available:
         && rm -rf /usr/local/src/drush7/docs \
         && rm -rf /usr/local/src/drush7/examples \
         && rm -rf /usr/local/src/drush7/misc \
-        && rm -rf /usr/local/src/drush7/tests \
   drush8:
     disabled: [5.2, 5.3]
     check: drush8 --version | grep -E '8[.0-9]+\s*$'
@@ -375,7 +374,6 @@ software_available:
         && rm -rf /usr/local/src/drush8/docs \
         && rm -rf /usr/local/src/drush8/examples \
         && rm -rf /usr/local/src/drush8/misc \
-        && rm -rf /usr/local/src/drush8/tests \
   drush9:
     disabled: [5.2, 5.3, 5.4, 5.5]
     check: drush9 --version | grep -E '9[.0-9]+\s*$'
@@ -392,7 +390,6 @@ software_available:
         && rm -rf /usr/local/src/drush9/docs \
         && rm -rf /usr/local/src/drush9/examples \
         && rm -rf /usr/local/src/drush9/misc \
-        && rm -rf /usr/local/src/drush9/tests \
   codeception:
     disabled: [5.2]
     check: codecept --version 2>/dev/null | grep -E '^Codeception(\sversion)?\s[.0-9]+$'