diff --git a/nodepool/elements/cache-devstack/install.d/99-cache-testrepository-db b/nodepool/elements/cache-devstack/install.d/99-cache-testrepository-db
index 8b636086a9..c96d039231 100755
--- a/nodepool/elements/cache-devstack/install.d/99-cache-testrepository-db
+++ b/nodepool/elements/cache-devstack/install.d/99-cache-testrepository-db
@@ -21,7 +21,7 @@ TEMPEST_DIR=/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 PyMySQL
+sudo -H /opt/git/subunit2sql-env/bin/pip install -U 'subunit2sql<0.4.0' testrepository PyMySQL
 
 sudo env PATH=/opt/git/subunit2sql-env/bin:$PATH /opt/git/subunit2sql-env/bin/python2 /opt/nodepool-scripts/prepare_tempest_testrepository.py $TEMPEST_DIR
 
diff --git a/nodepool/scripts/prepare_node_devstack.sh b/nodepool/scripts/prepare_node_devstack.sh
index 93457f7852..8e9efb0256 100755
--- a/nodepool/scripts/prepare_node_devstack.sh
+++ b/nodepool/scripts/prepare_node_devstack.sh
@@ -27,7 +27,7 @@ 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 PyMySQL
+sudo -H /opt/git/subunit2sql-env/bin/pip install -U testrepository 'subunit2sql<0.4.0' PyMySQL
 
 # Pre-seed tempest testrepository with data from subunit2sql
 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