diff --git a/install_venv.py b/install_venv.py
index 42b155f..452b8bd 100644
--- a/install_venv.py
+++ b/install_venv.py
@@ -48,8 +48,8 @@ def print_help(venv, root):
 def main(argv):
     root = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 
-    if os.environ.get('tools_path'):
-        root = os.environ['tools_path']
+    if os.environ.get('TOOLS_PATH'):
+        root = os.environ['TOOLS_PATH']
     venv = os.path.join(root, '.venv')
     if os.environ.get('VENV'):
         venv = os.environ['VENV']
diff --git a/run_tests_common.sh b/run_tests_common.sh
index 42fdbe3..7b790e6 100755
--- a/run_tests_common.sh
+++ b/run_tests_common.sh
@@ -72,7 +72,7 @@ function process_options {
 
 TOOLS_PATH=${TOOLS_PATH:-${PWD}}
 VENV_PATH=${VENV_PATH:-${PWD}}
-VENV_DIR=${VENV_NAME:-.venv}
+VENV_DIR=${VENV_DIR:-.venv}
 WITH_VENV=${TOOLS_PATH}/tools/with_venv.sh
 
 ALWAYS_VENV=0
@@ -99,7 +99,6 @@ process_options $@
 export VENV_PATH
 export TOOLS_PATH
 export VENV_DIR
-export VENV_NAME
 export WITH_VENV
 export VENV=${VENV_PATH}/${VENV_DIR}
 
diff --git a/with_venv.sh b/with_venv.sh
index 7303990..165c883 100755
--- a/with_venv.sh
+++ b/with_venv.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
-TOOLS_PATH=${TOOLS_PATH:-$(dirname $0)}
+TOOLS_PATH=${TOOLS_PATH:-$(dirname $0)/../}
 VENV_PATH=${VENV_PATH:-${TOOLS_PATH}}
-VENV_DIR=${VENV_NAME:-/../.venv}
-TOOLS=${TOOLS_PATH}
+VENV_DIR=${VENV_DIR:-/.venv}
 VENV=${VENV:-${VENV_PATH}/${VENV_DIR}}
 source ${VENV}/bin/activate && "$@"