diff --git a/nodepool/elements/cache-devstack/install.d/99-cache-testrepository-db b/nodepool/elements/cache-devstack/install.d/99-cache-testrepository-db
deleted file mode 100755
index 0e023f5715..0000000000
--- a/nodepool/elements/cache-devstack/install.d/99-cache-testrepository-db
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2014 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-#
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# dib-lint: disable=setpipefail
-if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
-    set -x
-fi
-set -eu
-
-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 env PATH=/opt/git/subunit2sql-env/bin:$PATH /opt/git/subunit2sql-env/bin/python /opt/nodepool-scripts/prepare_tempest_testrepository.py $TEMPEST_DIR
-
-sudo chown -R jenkins:jenkins $TEMPEST_DIR/preseed-streams
-
-# Delete the venv after the script
-sudo rm -rf /opt/git/subunit2sql-env
diff --git a/nodepool/scripts/prepare_tempest_testrepository.py b/nodepool/scripts/prepare_tempest_testrepository.py
deleted file mode 100755
index a933b85757..0000000000
--- a/nodepool/scripts/prepare_tempest_testrepository.py
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env python2
-#
-# Copyright 2014 Hewlett-Packard Development Company, L.P.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-import os
-import sys
-
-from subunit2sql.db import api
-from subunit2sql import shell
-from subunit2sql import write_subunit
-
-
-DB_URI = 'mysql+pymysql://query:query@logstash.openstack.org/subunit2sql'
-
-if len(sys.argv) == 2:
-    TEMPEST_PATH = sys.argv[1]
-elif len(sys.argv) > 2:
-    TEMPEST_PATH = sys.argv[1]
-    DB_URI = sys.argv[2]
-else:
-    TEMPEST_PATH = '/opt/stack/new/tempest'
-
-
-def main():
-    shell.parse_args([])
-    shell.CONF.set_override('connection', DB_URI, group='database')
-    session = api.get_session()
-    runs = api.get_recent_successful_runs_by_run_metadata(
-        'build_name', 'gate-tempest-dsvm-neutron-full',
-        num_runs=10, session=session)
-    session.close()
-    preseed_path = os.path.join(TEMPEST_PATH, 'preseed-streams')
-    if not os.path.isdir(preseed_path):
-        os.mkdir(preseed_path)
-    for run in runs:
-        with open(os.path.join(preseed_path, run.uuid + '.subunit'), 'w') as fd:
-            write_subunit.sql2subunit(run.uuid, fd)
-
-if __name__ == '__main__':
-    main()