diff --git a/docs/contributing.rst b/docs/contributing.rst
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -99,13 +99,14 @@ systems with /tmp mounted noexec will th
 You can also use ``tox`` to run the tests with all supported Python versions
 (currently Python 2.6--2.7).
 
-When running tests, Kallithea uses `kallithea/tests/test.ini` and populates the
-SQLite database specified there.
+When running tests, Kallithea generates a `test.ini` based on template values
+in `kallithea/tests/conftest.py` and populates the SQLite database specified
+there.
 
 It is possible to avoid recreating the full test database on each invocation of
 the tests, thus eliminating the initial delay. To achieve this, run the tests as::
 
-    gearbox serve -c kallithea/tests/test.ini --pid-file=test.pid --daemon
+    gearbox serve -c /tmp/kallithea-test-XXX/test.ini --pid-file=test.pid --daemon
     KALLITHEA_WHOOSH_TEST_DISABLE=1 KALLITHEA_NO_TMP_PATH=1 py.test
     kill -9 $(cat test.pid)
 
diff --git a/kallithea/i18n/how_to b/kallithea/i18n/how_to
--- a/kallithea/i18n/how_to
+++ b/kallithea/i18n/how_to
@@ -88,11 +88,8 @@ new translation instructions
 Testing translations
 --------------------
 
-Edit kallithea/tests/test.ini file and set lang attribute to::
-
-    lang=<new_language_code>
-
-Run Kallithea tests by executing::
+Edit `kallithea/tests/conftest.py` and set `i18n.lang` to `<new_language_code>`
+and run Kallithea tests by executing::
 
     py.test
 
diff --git a/kallithea/tests/conftest.py b/kallithea/tests/conftest.py
--- a/kallithea/tests/conftest.py
+++ b/kallithea/tests/conftest.py
@@ -46,6 +46,7 @@ def pytest_configure():
             'show_revision_number': 'true',
             'beaker.cache.sql_cache_short.expire': '1',
             'beaker.session.secret': '{74e0cd75-b339-478b-b129-07dd221def1f}',
+            #'i18n.lang': '',
         },
         '[handler_console]': {
             'formatter': 'color_formatter',
diff --git a/scripts/generate-ini.py b/scripts/generate-ini.py
--- a/scripts/generate-ini.py
+++ b/scripts/generate-ini.py
@@ -1,8 +1,6 @@
 #!/usr/bin/env python2
 """
-Based on kallithea/lib/paster_commands/template.ini.mako, generate
-  development.ini
-  kallithea/tests/test.ini
+Based on kallithea/lib/paster_commands/template.ini.mako, generate development.ini
 """
 
 import re