diff --git a/.travis.yml b/.travis.yml
index 451fe6f..81181d5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,10 +2,9 @@ sudo: required
 dist: trusty
 language: bash
 env:
-  - DOKKU_VERSION=master
-  - DOKKU_VERSION=v0.7.0
-  - DOKKU_VERSION=v0.6.0
-  - DOKKU_VERSION=v0.5.0
-  - DOKKU_VERSION=v0.4.0
-before_install: make setup
+  - DOKKU_VERSION=master DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis
+  - DOKKU_VERSION=v0.7.0 DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis
+  - DOKKU_VERSION=v0.6.0 DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis
+  - DOKKU_VERSION=v0.5.0 DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis
+  - DOKKU_VERSION=v0.4.0 DOKKU_SYSTEM_GROUP=travis DOKKU_SYSTEM_USER=travis
 script: make test
diff --git a/common-functions b/common-functions
index 413c050..d08b2e4 100755
--- a/common-functions
+++ b/common-functions
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
+source "$PLUGIN_AVAILABLE_PATH/config/functions"
 
 docker_ports_options() {
   declare desc="Exports a list of exposed ports"
diff --git a/tests/service_unlink.bats b/tests/service_unlink.bats
index 6958d45..cbd7c7f 100755
--- a/tests/service_unlink.bats
+++ b/tests/service_unlink.bats
@@ -39,10 +39,20 @@ teardown() {
 @test "($PLUGIN_COMMAND_PREFIX:unlink) removes link from docker-options" {
   dokku "$PLUGIN_COMMAND_PREFIX:link" l my_app >&2
   dokku "$PLUGIN_COMMAND_PREFIX:unlink" l my_app
-  options=$(dokku docker-options my_app | xargs)
+
   check_value=""
-  [[ "$(dokku version)" == "master" ]] && check_value="Deploy options: --restart=on-failure:10"
-  [[ "$(at-least-version 0.7.0 "$(dokku version)")" == "true" ]] && check_value="Deploy options: --restart=on-failure:10"
+  report_action="docker-options"
+  if [[ "$(dokku version)" == "master" ]]; then
+    check_value="Docker options build: Docker options deploy: --restart=on-failure:10 Docker options run:"
+    report_action="docker-options:report"
+  elif [[ "$(at-least-version 0.8.1 "$(dokku version)")" == "true" ]]; then
+    check_value="Docker options build: Docker options deploy: --restart=on-failure:10 Docker options run:"
+    report_action="docker-options:report"
+  elif [[ "$(at-least-version 0.7.0 "$(dokku version)")" == "true" ]]; then
+    check_value="Deploy options: --restart=on-failure:10"
+  fi
+
+  options=$(dokku $report_action my_app | xargs)
   assert_equal "$options" "$check_value"
 }
 
diff --git a/tests/setup.sh b/tests/setup.sh
index 5703c57..9f78440 100644
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/test_helper.bash"
 
 BIN_STUBS="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/bin"
@@ -10,6 +11,11 @@ fi
 cd $DOKKU_ROOT
 echo "Dokku version $DOKKU_VERSION"
 git checkout $DOKKU_VERSION > /dev/null
+if grep go-build Makefile > /dev/null; then
+  mv "$BIN_STUBS/docker" "$BIN_STUBS/docker-stub"
+  make go-build
+  mv "$BIN_STUBS/docker-stub" "$BIN_STUBS/docker"
+fi
 cd -
 
 source "$(dirname "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)")/config"
diff --git a/tests/test_helper.bash b/tests/test_helper.bash
index 1cad2f1..a1441b0 100644
--- a/tests/test_helper.bash
+++ b/tests/test_helper.bash
@@ -11,6 +11,7 @@ export PLUGIN_CORE_AVAILABLE_PATH="$PLUGIN_PATH"
 export REDIS_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/fixtures"
 export PLUGIN_DATA_ROOT="$REDIS_ROOT"
 export PLUGIN_CONFIG_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/config"
+export DOKKU_LIB_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/lib-root"
 if [[ "$(uname)" == "Darwin" ]]; then
   export PLUGN_URL="https://github.com/dokku/plugn/releases/download/v0.3.0/plugn_0.3.0_darwin_x86_64.tgz"
 else