diff --git a/requirements.txt b/requirements.txt
index 0d7aa7093c..0bad659c49 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,3 +7,4 @@ six>=1.10.0 # MIT
 packaging>=16.5 # Apache-2.0
 requests>=2.14.2 # Apache-2.0
 PyYAML>=3.12 # MIT
+beagle>=0.2.1 # Apache-2.0
diff --git a/tools/list-unused-packages.sh b/tools/list-unused-packages.sh
new file mode 100755
index 0000000000..51681b0c73
--- /dev/null
+++ b/tools/list-unused-packages.sh
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+
+# 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.
+
+# Lists any packages in global-constraints that appear to no longer be used
+
+TOOLSDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+BASEDIR=$(dirname ${TOOLSDIR})
+
+# Make sure we are using our venv
+if [[ -z "${VIRTUAL_ENV}" ]]; then
+    if [[ ! -d ${BASEDIR}/.tox/venv ]]; then
+        (cd ${BASEDIR} && tox -e venv --notest > /dev/null)
+    fi
+    source ${BASEDIR}/.tox/venv/bin/activate
+fi
+
+update=
+if [[ "$#" -eq 1 ]]; then
+    update="${1}"
+fi
+
+search_reqs ()
+{
+    beagle search --ignore-case --file '(.*requirement.*|setup.cfg)' "${1}" | \
+        grep "openstack/" | \
+        # Sometimes we get false positives from a package name being a
+        # substring within another package. This filter isn't working right
+        # though. This just means we might miss a package that isn't being
+        # used.
+        # grep "${1}[ |\!|>]" | \
+        grep -v "openstack.requirements"
+}
+
+# Get a list of all package names by filtering out comments, blank lines, and
+# any package modifiers like version constraints.
+reqs=$(sed 's/[!|>|<|=|;].*//g' global-requirements.txt |
+        sed 's/  .*//g' |
+        sed '/^#/d' |
+        sed '/^$/d' |
+        sort | uniq)
+
+# Loop through each package and check for its presence in any repo's
+# requirements files other than mentions in its own repo
+for req in $reqs; do
+    count=$(search_reqs ${req} |
+            grep -v " openstack/${req}  " |
+            wc -l)
+    if [[ ${count} -eq 0 ]]; then
+        echo "${req}"
+
+        # See if we should clean up the requirements files
+        if [[ "${update}" == "--update" ]]; then
+            sed -i "/${req}/d" global-requirements.txt
+            sed -i "/${req}/d" upper-constraints.txt
+        fi
+    fi
+done