diff --git a/tools/install_venv.py b/tools/install_venv.py
index 60f4894ed1..abf56ea0ef 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -22,9 +22,6 @@
 import os
 import sys
 
-parentdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-os.sys.path.insert(0, parentdir)
-
 import install_venv_common as install_venv
 
 
diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py
index b15011a004..3d47b12b24 100644
--- a/tools/install_venv_common.py
+++ b/tools/install_venv_common.py
@@ -25,6 +25,13 @@ import os
 import subprocess
 import sys
 
+
+possible_topdir = os.getcwd()
+if os.path.exists(os.path.join(possible_topdir, "nova",
+                               "__init__.py")):
+    sys.path.insert(0, possible_topdir)
+
+
 from nova.openstack.common import cfg