diff --git a/.travis.yml b/.travis.yml
index 7bc5f29..3bec92f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,7 @@ env: # These should match the tox env list
     - TOXENV=pypy
 install: pip install coveralls tox
 script: tox
-# Special snowflake.  Our tests depend on making real commits.
 before_install:
-  - git config --global user.name "Travis CI"
-  - git config --global user.email "user@example.com"
   # Install git-lfs for a test
   - './get-git-lfs.py && export PATH="/tmp/git-lfs:$PATH"'
 after_success:
diff --git a/tox.ini b/tox.ini
index b196c13..bf2eba2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,6 +6,11 @@ envlist = py27,py34,py35,pypy
 [testenv]
 deps = -rrequirements-dev.txt
 passenv = HOME HOMEPATH PROGRAMDATA
+setenv =
+    GIT_AUTHOR_NAME = "test"
+    GIT_COMMITTER_NAME = "test"
+    GIT_AUTHOR_EMAIL = "test@example.com"
+    GIT_COMMITTER_EMAIL = "test@example.com"
 commands =
     coverage erase
     coverage run -m pytest {posargs:tests}