diff --git a/scripts/install-octopi.sh b/scripts/install-octopi.sh
index bec01d1a..dc0aebc7 100755
--- a/scripts/install-octopi.sh
+++ b/scripts/install-octopi.sh
@@ -34,7 +34,8 @@ create_virtualenv()
     report_status "Updating python virtual environment..."
 
     # Create virtualenv if it doesn't already exist
-    [ ! -d ${PYTHONDIR} ] && virtualenv ${PYTHONDIR}
+    [ ! -d ${PYTHONDIR} ] && virtualenv --no-setuptools ${PYTHONDIR}
+    [ ! -x ${PYTHONDIR}/bin/pip ] && virtualenv ${PYTHONDIR}
 
     # Install/update dependencies
     ${PYTHONDIR}/bin/pip install -r ${SRCDIR}/scripts/klippy-requirements.txt