diff --git a/php-lint/php-lint b/php-lint/php-lint
index afb52f2337d64b0c7e1b97b4daf665909e744329..c14a4f3fc19d134c1aa02ad0396eee672b40d423 100644
--- a/php-lint/php-lint
+++ b/php-lint/php-lint
@@ -51,8 +51,8 @@ for dir in "${LINT_DIRS[@]}"; do
     echo "Scanning directory ${dir} for extension ${ext}"
 
     # Scan current dir and ext and lint them
-    for f in $(find "${dir}" -type f -name "*${ext}"); do
-      OUTPUT=$(php -l $f 2>&1)
+    find "${dir}" -type f -name "*${ext}" -print0 | while IFS= read -r -d '' f; do
+      OUTPUT=$(php -l "$f" 2>&1)
       rc=$?
 
       if [[ $rc != 0 ]]; then # Non-zero exit code, print error and exit
diff --git a/php-unit-test/7.1/Dockerfile b/php-unit-test/7.1/Dockerfile
index 63ce09cb3f9dc803d13341d5a6edeab378b2c7cd..43734cacb69357d313dcd9c877a57ed4e1312e64 100644
--- a/php-unit-test/7.1/Dockerfile
+++ b/php-unit-test/7.1/Dockerfile
@@ -12,9 +12,10 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.schema-version="1.0" \
       maintainer="Alan Nelson <alan.nelson@nebraska.edu>"
 
-RUN apk add --no-cache bash nodejs nodejs-npm $PHPIZE_DEPS \
-    && pecl install xdebug \
-    && docker-php-ext-enable xdebug \
+RUN apk add --no-cache bash nodejs nodejs-npm libmcrypt-dev $PHPIZE_DEPS \
+    && pecl install xdebug redis \
+    && docker-php-ext-enable xdebug redis \
+    && docker-php-ext-install mcrypt \
     && apk del --no-cache $PHPIZE_DEPS
 RUN curl -o /usr/local/bin/composer https://getcomposer.org/composer.phar \
   && chmod 755 /usr/local/bin/composer
diff --git a/php-unit-test/7.2/Dockerfile b/php-unit-test/7.2/Dockerfile
index 97bdcd162a98ea51fc46b6bc3885aff7b827d710..7edf64a73c851ef23929c0231ca831f6f20d9883 100644
--- a/php-unit-test/7.2/Dockerfile
+++ b/php-unit-test/7.2/Dockerfile
@@ -13,8 +13,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       maintainer="Alan Nelson <alan.nelson@nebraska.edu>"
 
 RUN apk add --no-cache bash nodejs nodejs-npm $PHPIZE_DEPS \
-    && pecl install xdebug \
-    && docker-php-ext-enable xdebug \
+    && pecl install xdebug redis \
+    && docker-php-ext-enable xdebug redis \
     && apk del --no-cache $PHPIZE_DEPS
 RUN curl -o /usr/local/bin/composer https://getcomposer.org/composer.phar \
   && chmod 755 /usr/local/bin/composer