diff --git a/tools/test_tox_targets.sh b/tools/test_tox_targets.sh
index 9c47c71..9eafbba 100755
--- a/tools/test_tox_targets.sh
+++ b/tools/test_tox_targets.sh
@@ -18,6 +18,8 @@ cd $project_dir
 # PBR requires a git repo for versioning
 git init .
 # openstackdocstheme requires commits for last modified calculation
+git config user.email "test@example.com"
+git config user.name "Test Name"
 git add .
 git commit -m "Test commit"
 
@@ -28,4 +30,4 @@ def test_api():
     pass
 EOF
 
-tox -e pep8,py27,py36,py37,docs,lower-constraints,cover
+tox -e pep8,py27,py36,docs,lower-constraints,cover
diff --git a/tox.ini b/tox.ini
index ae1ea0d..ae731b3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,5 +6,4 @@ skipsdist = True
 [testenv:cookiecutter]
 deps = cookiecutter
 commands =
-    mkdir -p {envdir}/tmp
-    {toxinidir}/tools/test_template.sh {envdir}/tmp
+    {toxinidir}/tools/test_tox_targets.sh