diff --git a/test/lib/git/repo_management_test.sh b/test/lib/git/repo_management_test.sh
index d4cd3f9..71b9212 100755
--- a/test/lib/git/repo_management_test.sh
+++ b/test/lib/git/repo_management_test.sh
@@ -7,17 +7,17 @@
 #
 # Unit tests for git shell scripts
 
-scmbDir="$( cd -P "$( dirname "$0" )" && pwd )"
+export scmbDir="$( cd -P "$( dirname "$0" )" && pwd )/../../.."
 
 # Zsh compatibility
 if [ -n "${ZSH_VERSION:-}" ]; then shell="zsh"; SHUNIT_PARENT=$0; setopt shwordsplit; fi
 
 # Load test helpers
-. "$scmbDir/../../support/test_helper"
+. "$scmbDir/test/support/test_helper"
 
 # Load functions to test
-. "$scmbDir/../../../lib/_shared.sh"
-. "$scmbDir/../../../lib/git/repo_management.sh"
+. "$scmbDir/lib/_shared.sh"
+. "$scmbDir/lib/git/repo_management.sh"
 
 
 # Setup and tear down
@@ -181,5 +181,5 @@ test_git_repo_tab_completion() {
 
 # load and run shUnit2
 # Call this function to run tests
-. "$scmbDir/../../support/shunit2"
+. "$scmbDir/test/support/shunit2"
 
diff --git a/test/lib/git/status_shortcuts_test.sh b/test/lib/git/status_shortcuts_test.sh
index 1cb774a..baee4a5 100755
--- a/test/lib/git/status_shortcuts_test.sh
+++ b/test/lib/git/status_shortcuts_test.sh
@@ -7,18 +7,18 @@
 #
 # Unit tests for git shell scripts
 
-scmbDir="$( cd -P "$( dirname "$0" )" && pwd )"
+export scmbDir="$( cd -P "$( dirname "$0" )" && pwd )/../../.."
 
 
 # Zsh compatibility
 if [ -n "${ZSH_VERSION:-}" ]; then shell="zsh"; SHUNIT_PARENT=$0; setopt shwordsplit; fi
 
 # Load test helpers
-. "$scmbDir/../../support/test_helper"
+. "$scmbDir/test/support/test_helper"
 
 # Load functions to test
-. "$scmbDir/../../../lib/_shared.sh"
-. "$scmbDir/../../../lib/git/status_shortcuts.sh"
+. "$scmbDir/lib/_shared.sh"
+. "$scmbDir/lib/git/status_shortcuts.sh"
 
 
 # Setup and tear down
@@ -252,5 +252,5 @@ test_git_commit_prompt() {
 
 
 # load and run shUnit2
-. "$scmbDir/../../support/shunit2"
+. "$scmbDir/test/support/shunit2"