diff --git a/tox.ini b/tox.ini
index 448d104..ff23d16 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,6 +18,11 @@ commands =
     python -m doctest README.rst
 
 [testenv:metadata]
+setenv =
+     # PBR_VERSION is a workaround for check-manifest, which wants to
+     # make "clean sdists" that do not include egg-info. As a result,
+     # pbr can't figure out the package version.
+     PBR_VERSION = 0.0.0
 deps =
      check-manifest==0.21
      pep8==1.5.7
@@ -26,8 +31,7 @@ deps =
      pip-tools==0.3.4
      pyroma==1.6
 commands =
-    # check-manifest temporarily disabled pending bug resolution:
-    # https://github.com/mgedmin/check-manifest/issues/30
+    check-manifest
     pyflakes jorji
     pep8 jorji
     pep257 jorji