diff --git a/nodepool/elements/cache-devstack/extra-data.d/51-cache-testrepository-db b/nodepool/elements/cache-devstack/install.d/99-cache-testrepository-db
similarity index 83%
rename from nodepool/elements/cache-devstack/extra-data.d/51-cache-testrepository-db
rename to nodepool/elements/cache-devstack/install.d/99-cache-testrepository-db
index 683205b297..34f5b6da23 100755
--- a/nodepool/elements/cache-devstack/extra-data.d/51-cache-testrepository-db
+++ b/nodepool/elements/cache-devstack/install.d/99-cache-testrepository-db
@@ -22,9 +22,9 @@ TEMPEST_DIR=$TMP_MOUNT_PATH/opt/git/openstack/tempest
 
 # Setup venv and Install python deps from pip
 sudo virtualenv /opt/git/subunit2sql-env
-sudo -H /opt/git/subunit2sql-env/bin/pip install -U subunit2sql testrepository
+sudo -H /opt/git/subunit2sql-env/bin/pip install -U subunit2sql testrepository PyMySQL
 
-sudo /opt/git/subunit2sql-env/bin/python2 /opt/nodepool-scripts/prepare_tempest_testrepository.py $TEMPEST_DIR
+sudo env PATH=/opt/git/subunit2sql-env/bin:$PATH /opt/git/subunit2sql-env/bin/python2 /opt/nodepool-scripts/prepare_tempest_testrepository.py $TEMPEST_DIR
 
 # Delete the venv after the script
 sudo rm -rf /opt/git/subunit2sql-env
diff --git a/nodepool/scripts/prepare_node_devstack.sh b/nodepool/scripts/prepare_node_devstack.sh
index 7dca2178ff..ac3082b3cf 100755
--- a/nodepool/scripts/prepare_node_devstack.sh
+++ b/nodepool/scripts/prepare_node_devstack.sh
@@ -27,10 +27,10 @@ sudo -u jenkins -i /opt/nodepool-scripts/prepare_devstack.sh "$HOSTNAME"
 
 # Setup venv and install deps for prepare_tempest_testrepository.py
 sudo virtualenv -p python2 /opt/git/subunit2sql-env
-sudo -H /opt/git/subunit2sql-env/bin/pip install -U testrepository subunit2sql
+sudo -H /opt/git/subunit2sql-env/bin/pip install -U testrepository subunit2sql PyMySQL
 
 # Pre-seed tempest testrepository with data from subunit2sql
-sudo -i /opt/git/subunit2sql-env/bin/python2 /opt/nodepool-scripts/prepare_tempest_testrepository.py $TEMPEST_DIR
+sudo -i env PATH=/opt/git/subunit2sql-env/bin:$PATH /opt/git/subunit2sql-env/bin/python2 /opt/nodepool-scripts/prepare_tempest_testrepository.py $TEMPEST_DIR
 
 # Dekete the venv after the script is called
 sudo rm -rf /opt/git/subunit2sql-env
diff --git a/nodepool/scripts/prepare_tempest_testrepository.py b/nodepool/scripts/prepare_tempest_testrepository.py
index b7a7ddb960..d0205255f2 100755
--- a/nodepool/scripts/prepare_tempest_testrepository.py
+++ b/nodepool/scripts/prepare_tempest_testrepository.py
@@ -24,7 +24,7 @@ from subunit2sql import write_subunit
 from common import run_local
 
 
-DB_URI = 'mysql://query:query@logstash.openstack.org/subunit2sql'
+DB_URI = 'mysql+pymysql://query:query@logstash.openstack.org/subunit2sql'
 
 if len(sys.argv) == 2:
     TEMPEST_PATH = sys.argv[1]