diff --git a/test/Dockerfile-alpine b/test/Dockerfile-alpine
index 2c28f48..b0a0ae1 100644
--- a/test/Dockerfile-alpine
+++ b/test/Dockerfile-alpine
@@ -7,7 +7,7 @@ RUN apk --no-cache add supervisor openssl git curl bind-tools drill wget nginx b
 WORKDIR /root
 
 # Create nginx directories in standard places
-RUN mkdir /run/nginx
+RUN mkdir -p /run/nginx
 RUN mkdir -p /etc/nginx/pki/private
 
 # Setup ftp
diff --git a/test/test_helper.bash b/test/test_helper.bash
index 48a8d4b..5745332 100644
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -92,6 +92,8 @@ fi
 # Find NGINX configuration directory for HTTP-01 testing (need to add SSL to config)
 if [[ -f /etc/nginx/conf.d/default.conf ]]; then
   export NGINX_CONFIG=/etc/nginx/conf.d/default.conf
+elif [[ -f /etc/nginx/http.d/default.conf ]]; then
+  export NGINX_CONFIG=/etc/nginx/http.d/default.conf
 elif [[ -f /etc/nginx/sites-enabled/default ]]; then
   export NGINX_CONFIG=/etc/nginx/sites-enabled/default
 else