diff --git a/commands/backstopjs/backstopjs b/commands/backstopjs/backstopjs
index 37e2d24..5f4fb5e 100755
--- a/commands/backstopjs/backstopjs
+++ b/commands/backstopjs/backstopjs
@@ -7,13 +7,14 @@
 ## Example: "ddev backstopjs version"
 ## ExecRaw: true
 
-FOLDER=${$1:-local}
-ARGS=${@:2}
+FOLDER=$1
+
+ARGS=${*:2}
 
 if [ "$1" == "openReport" -o "$1" == "remote" ]; then
   echo "This does not work for backstop in ddev"
   exit 1
 fi
 
-cd /src/tests/backstopjs/$FOLDER
+cd /src/tests/$FOLDER || exit 1
 NODE_PATH="/usr/local/lib/node_modules/" backstop "$ARGS"
diff --git a/docker-compose.backstopjs.yaml b/docker-compose.backstopjs.yaml
index 9331451..b7350c2 100644
--- a/docker-compose.backstopjs.yaml
+++ b/docker-compose.backstopjs.yaml
@@ -31,7 +31,7 @@ services:
       com.ddev.site-name: ${DDEV_SITENAME}
       com.ddev.approot: ${DDEV_APPROOT}
     volumes:
-      - ../tests:/src/tests
+      - ../tests/backstopjs:/src/tests
       - .:/mnt/ddev_config:ro
       - ddev-global-cache:/mnt/ddev-global-cache
     networks: