diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..62c8935
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea/
\ No newline at end of file
diff --git a/circleci/Dockerfile b/circleci/Dockerfile
index 00e0320..858ac80 100644
--- a/circleci/Dockerfile
+++ b/circleci/Dockerfile
@@ -23,7 +23,7 @@ RUN \
     sudo docker-php-ext-enable exif
 
 # Install tools for Wordpress
-ADD wp-tests-8.0.0.tar.gz /
+ADD wp-tests-8.0.1.tar.gz /
 RUN \
   sudo mv /wp-tests /opt && \
   sudo chown root:root /opt/wp-tests -R && \
@@ -31,6 +31,11 @@ RUN \
   chmod +x wp-cli.phar && \
   sudo mv wp-cli.phar /usr/local/bin/wp
 
+# Install GO (required for phpgrep)
+RUN sudo curl -O https://dl.google.com/go/go1.13.linux-amd64.tar.gz \
+    && sudo tar -C /usr/local -xzf go1.13.linux-amd64.tar.gz
+RUN sudo /usr/local/go/bin/go get -v github.com/quasilyte/phpgrep/cmd/phpgrep && sudo chmod +x /root/go/bin/phpgrep && sudo mv /root/go/bin/phpgrep /usr/local/bin/phpgrep
+
 # Download and configure Wordpress
 RUN wp core download --path=/var/www/html --allow-root
 
diff --git a/circleci/wp-tests-8.0.0.tar.gz b/circleci/wp-tests-8.0.0.tar.gz
deleted file mode 100644
index 1d75fe0..0000000
Binary files a/circleci/wp-tests-8.0.0.tar.gz and /dev/null differ
diff --git a/circleci/wp-tests-8.0.1.tar.gz b/circleci/wp-tests-8.0.1.tar.gz
new file mode 100644
index 0000000..21782ee
Binary files /dev/null and b/circleci/wp-tests-8.0.1.tar.gz differ
diff --git a/php7.3/Dockerfile b/php7.3/Dockerfile
index fe58cbf..91097a3 100644
--- a/php7.3/Dockerfile
+++ b/php7.3/Dockerfile
@@ -19,7 +19,7 @@ RUN apt-get update \
     && add-apt-repository ppa:ondrej/php \
     && apt-get update
 
-RUN apt-get install -y mysql-server libmysqlclient-dev --no-install-recommends
+RUN apt-get update && apt-get install -y mysql-server libmysqlclient-dev --no-install-recommends
 
 RUN apt-get install -y php7.3 php7.3-common php7.3-dev php7.3-dom php7.3-xdebug php7.3-zip php7.3-cli php7.3-mbstring php7.3-pdo php7.3-fpm php7.3-curl php7.3-mysql php7.3-gd php7.3-readline
 
@@ -29,10 +29,15 @@ RUN sed -i "/upload_max_filesize = .*/c\upload_max_filesize = 200M" /etc/php/7.3
     && sed -i "/memory_limit = .*/c\memory_limit = 256M" /etc/php/7.3/cli/php.ini \
     && sed -i "s/zend_extension/;zend_extension/g" /etc/php/7.3/mods-available/xdebug.ini
 
-
 RUN tar -zxvf /opt/wp-tests-8.0.1.tar.gz -C /opt
 RUN chown root:root /opt/wp-tests -R
 
+# Install GO (required for phpgrep)
+RUN curl -O https://dl.google.com/go/go1.13.linux-amd64.tar.gz \
+    && tar -C /usr/local -xzf go1.13.linux-amd64.tar.gz
+RUN export PATH=$PATH:/usr/local/go/bin
+RUN /usr/local/go/bin/go get -v github.com/quasilyte/phpgrep/cmd/phpgrep && sudo chmod +x /root/go/bin/phpgrep && sudo /root/go/bin/phpgrep /usr/local/bin/phpgrep
+
 WORKDIR /var/www/html
 
 # Configure mysql sock
@@ -52,7 +57,7 @@ RUN usermod -d /var/lib/mysql mysql && find /var/lib/mysql -exec touch {} \; &&
 RUN find /var/lib/mysql -exec touch {} \; && /etc/init.d/mysql start \
     && wp core download --path=/var/www/html --allow-root \
     && wp core config --path=/var/www/html --dbhost=127.0.0.1 --dbname=test --dbuser=wpuser --dbpass=wpuser --allow-root \
-    && wp core install --url=http://localhost --title=Test --admin_user=admin --admin_password=12345 --admin_email=test@test.com --path=/var/www/html --allow-root
+    && wp core install --url=http://localhost --title=Test --admin_user=admin --admin_password=12345 --admin_email=test@test.com --path=/var/www/html --allow-root --skip-email
 
 # Install node and chrome
 RUN \
@@ -74,4 +79,4 @@ RUN \
   export npm_config_unsafe_perm=true
 
 # Start the mysql
-ENTRYPOINT /etc/init.d/mysql start && bash
+ENTRYPOINT find /var/lib/mysql -type f -exec touch {} \; && service mysql start && bash