diff --git a/.travis.yml b/.travis.yml
index 60e36f4..5df25b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,7 +46,7 @@ jobs:
 
     - name: "dgoss tests"
       before_script:
-        - curl -fsSL https://raw.githubusercontent.com/SimonBaeumer/commander/master/install.sh | COMMANDER_DST=~/bin sh
+        - curl -fsSL https://raw.githubusercontent.com/SimonBaeumer/commander/master/install.sh | COMMANDER_VER=v0.2.1 COMMANDER_DST=~/bin sh
       script:
         - make build
         - make test-dgoss
diff --git a/extras/dgoss/commander.yaml b/extras/dgoss/commander.yaml
index 4611b3e..56feca1 100644
--- a/extras/dgoss/commander.yaml
+++ b/extras/dgoss/commander.yaml
@@ -1,6 +1,11 @@
+config:
+  timeout: 20000 # Set timeout to 20s
+  env:
+    - GOSS_PATH=./../../release/goss-linux-amd64
+    - GOSS_FILES_STRATEGY=mount
 tests:
   run dgoss with mount strategy:
-    command: "GOSS_PATH=./../../release/goss-linux-amd64 GOSS_FILES_STRATEGY=mount ./dgoss run nginx:latest"
+    command: "./dgoss run nginx:latest"
     stdout:
       contains:
         - "Count: 1, Failed: 0, Skipped: 0"
@@ -10,7 +15,11 @@ tests:
     exit-code: 0
 
   run dgoss with cp strategy:
-    command: "GOSS_PATH=./../../release/goss-linux-amd64 GOSS_FILES_STRATEGY=cp ./dgoss run nginx:latest"
+    command: "./dgoss run nginx:latest"
+    config:
+      env:
+        - GOSS_PATH=./../../release/goss-linux-amd64
+        - GOSS_FILES_STRATEGY=cp
     stdout:
       contains:
         - "Count: 1, Failed: 0, Skipped: 0"
@@ -21,5 +30,8 @@ tests:
     exit-code: 0
 
   run dgoss with invalid goss path:
-    command: "GOSS_PATH=/invalid ./dgoss run nginx:latest"
+    command: "./dgoss run nginx:latest"
+    config:
+      env:
+        - GOSS_PATH=invalid
     exit-code: 1
\ No newline at end of file