diff --git a/MANIFEST.in b/MANIFEST.in
index 9c59a76b43..fa69c1aa3c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -20,4 +20,4 @@ graft keystone/tests
 graft tools
 graft examples
 recursive-include keystone *.json *.xml *.cfg *.pem README *.po *.pot *.sql
-global-exclude *.pyc *.sdx *.log *.db *.swp tests/tmp/*
+global-exclude *.pyc *.sdx *.log *.db *.swp keystone/tests/tmp/*
diff --git a/keystone/tests/core.py b/keystone/tests/core.py
index 9b2993fb88..f651d5aaa5 100644
--- a/keystone/tests/core.py
+++ b/keystone/tests/core.py
@@ -89,7 +89,7 @@ TMPDIR = _calc_tmpdir()
 CONF = config.CONF
 
 exception._FATAL_EXCEPTION_FORMAT_ERRORS = True
-os.mkdir(TMPDIR)
+os.makedirs(TMPDIR)
 atexit.register(shutil.rmtree, TMPDIR)