diff --git a/MANIFEST.in b/MANIFEST.in
index 5fe071de..d6e33ad8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,8 +7,6 @@ include HACKING.rst
 include LICENSE
 include ChangeLog
 include babel.cfg tox.ini
-include openstack-common.conf
-include glance/openstack/common/README
 include glance/db/sqlalchemy/migrate_repo/README
 include glance/db/sqlalchemy/migrate_repo/migrate.cfg
 include glance/db/sqlalchemy/migrate_repo/versions/*.sql
diff --git a/glance/openstack/common/README b/glance/openstack/common/README
deleted file mode 100644
index 04a61664..00000000
--- a/glance/openstack/common/README
+++ /dev/null
@@ -1,16 +0,0 @@
-oslo-incubator
---------------
-
-A number of modules from oslo-incubator are imported into this project.
-You can clone the oslo-incubator repository using the following url:
-
-  git://git.openstack.org/openstack/oslo-incubator
-
-These modules are "incubating" in oslo-incubator and are kept in sync
-with the help of oslo-incubator's update.py script. See:
-
-  https://wiki.openstack.org/wiki/Oslo#Syncing_Code_from_Incubator
-
-The copy of the code should never be directly modified here. Please
-always update oslo-incubator first and then run the script to copy
-the changes across.
diff --git a/glance/openstack/common/__init__.py b/glance/openstack/common/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/openstack-common.conf b/openstack-common.conf
deleted file mode 100644
index f5f4f6be..00000000
--- a/openstack-common.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-
-# The base module to hold the copy of openstack.common
-base=glance
diff --git a/run_tests.sh b/run_tests.sh
index 41a5f784..beb8a525 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -154,9 +154,8 @@ function run_tests {
 
   if [ $coverage -eq 1 ]; then
     echo "Generating coverage report in covhtml/"
-    # Don't compute coverage for common code, which is tested elsewhere
     ${wrapper} coverage combine
-    ${wrapper} coverage html --include='glance/*' --omit='glance/openstack/common/*' -d covhtml -i
+    ${wrapper} coverage html --include='glance/*' -d covhtml -i
   fi
 
   return $RESULT
diff --git a/tox.ini b/tox.ini
index 6707a310..432645ca 100644
--- a/tox.ini
+++ b/tox.ini
@@ -77,7 +77,7 @@ commands = python setup.py build_sphinx
 # H404  multi line docstring should start with a summary
 # H405  multi line docstring summary not separated with an empty line
 ignore = E711,E712,H404,H405
-exclude = .venv,.git,.tox,dist,doc,etc,*glance/locale*,*openstack/common*,*lib/python*,*egg,build
+exclude = .venv,.git,.tox,dist,doc,etc,*glance/locale*,*lib/python*,*egg,build
 
 [hacking]
 local-check-factory = glance.hacking.checks.factory