diff --git a/Makefile b/Makefile
index a266f36..93a7332 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ lint:
 
 unit-tests:
 	@echo running unit tests...
-	@$(QUIET) bats tests/unit
+	@$(QUIET) bats tests
 
 setup:
 	bash tests/setup.sh
diff --git a/tests/bin/id b/tests/bin/id
new file mode 100755
index 0000000..69e079b
--- /dev/null
+++ b/tests/bin/id
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+echo "dokku"
diff --git a/tests/unit/service.bats b/tests/service.bats
similarity index 100%
rename from tests/unit/service.bats
rename to tests/service.bats
diff --git a/tests/setup.sh b/tests/setup.sh
index 85623e3..57fdc95 100644
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/unit/test_helper.bash"
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/test_helper.bash"
 
 if [[ ! -d $DOKKU_ROOT ]]; then
   git clone https://github.com/progrium/dokku.git $DOKKU_ROOT > /dev/null
diff --git a/tests/unit/test_helper.bash b/tests/test_helper.bash
similarity index 88%
rename from tests/unit/test_helper.bash
rename to tests/test_helper.bash
index 4a1684a..acea3b8 100644
--- a/tests/unit/test_helper.bash
+++ b/tests/test_helper.bash
@@ -3,7 +3,7 @@
 export DOKKU_QUIET_OUTPUT=1
 export DOKKU_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/dokku"
 export DOKKU_VERSION=${DOKKU_VERSION:-"master"}
-export PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/dokku:$PATH"
+export PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/bin:$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/dokku:$PATH"
 export PLUGIN_PATH="$DOKKU_ROOT/plugins"
 export SERVICE=redis