diff --git a/.gitignore b/.gitignore
index ba0d5b3..f4bd660 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@
 .\#*
 \#*\#
 .config/
-goss.yaml
+/goss.yaml
diff --git a/build-n-test.sh b/build-n-test.sh
index 3d0a77d..667499d 100755
--- a/build-n-test.sh
+++ b/build-n-test.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -e
 
+cd $(dirname $0)
+
 images=('alpine' 'debian')
 
 if [ "$(docker version --format '{{.Server.Experimental}}')" = 'true' ]; then
@@ -15,12 +17,10 @@ for image in "${images[@]}"; do
     docker build -t $tag -f $image.Dockerfile .
 
     echo "Testing image"
-    cp goss-default.yaml goss.yaml
-    dgoss run $tag
+    GOSS_FILES_PATH=./tests/default dgoss run $tag
 
     echo "Testing again with UID and GID"
-    cp goss-uid-test.yaml goss.yaml
-    dgoss run -e UID=1001 -e GID=101 $tag
+    GOSS_FILES_PATH=./tests/uid-test dgoss run -e UID=1001 -e GID=101 $tag
 done
 
 
diff --git a/goss-default.yaml b/tests/default/goss.yaml
similarity index 100%
rename from goss-default.yaml
rename to tests/default/goss.yaml
diff --git a/goss-uid-test.yaml b/tests/uid-test/goss.yaml
similarity index 100%
rename from goss-uid-test.yaml
rename to tests/uid-test/goss.yaml