Index: docs/settings.txt
===================================================================
--- docs/settings.txt	(revision 6898)
+++ docs/settings.txt	(working copy)
@@ -981,8 +981,11 @@
 
 Default: ``None``
 
-The name of database to use when running the test suite. If a value of
-``None`` is specified, the test database will use the name ``'test_' + settings.DATABASE_NAME``. See `Testing Django Applications`_.
+The name of database to use when running the test suite.
+If a value of ``None`` is specified and the SQLite database engine is used the
+tests will use a memory resident database. For all other database engines the test
+database will use the name ``'test_' + settings.DATABASE_NAME``.
+See `Testing Django Applications`_.
 
 .. _Testing Django Applications: ../testing/
 
Index: docs/testing.txt
===================================================================
--- docs/testing.txt	(revision 6898)
+++ docs/testing.txt	(working copy)
@@ -270,28 +270,22 @@
 
     $ ./manage.py test animals.AnimalTestCase.testFluffyAnimals
 
-Understanding the test output
------------------------------
+The test database
+-----------------
 
-When you run your tests, you'll see a number of messages as the test runner
-prepares itself::
+Tests that require a database (namely, model tests) will not use
+your "real" (production) database. A separate, blank database is created
+for the tests.
 
-    Creating test database...
-    Creating table myapp_animal
-    Creating table myapp_mineral
-    Loading 'initial_data' fixtures...
-    No fixtures found.
+Regardless of whether the tests pass or fail, the test database is destroyed when
+all the tests have been executed.
 
-This tells you that the test runner is creating a test database -- a blank,
-from-scratch database that it will use for any tests that happen to require a
-database (namely, model tests).
+By default this test database gets its name by prepending ``test_`` to the value
+of the ``DATABASE_NAME`` setting. When using the SQLite database engine the tests
+will by default use a memory resident database (i.e. ``:memory:``).
+If you want to use a different database name, specify the ``TEST_DATABASE_NAME``
+setting.
 
-Don't worry -- the test runner will not touch your "real" (production)
-database. It creates a separate database purely for the tests. This test
-database gets its name by prepending ``test_`` to the value of the
-``DATABASE_NAME`` setting. If you want to use a different name, specify the
-``TEST_DATABASE_NAME`` setting.
-
 Aside from using a separate database, the test runner will otherwise use all of
 the same database settings you have in your settings file: ``DATABASE_ENGINE``,
 ``DATABASE_USER``, ``DATABASE_HOST``, etc. The test database is created by the
@@ -306,6 +300,22 @@
 
 .. _settings: ../settings/
 
+Understanding the test output
+-----------------------------
+
+When you run your tests, you'll see a number of messages as the test runner
+prepares itself. You can control the level of detail of these messages with the
+``verbosity`` option on the command line::
+
+    Creating test database...
+    Creating table myapp_animal
+    Creating table myapp_mineral
+    Loading 'initial_data' fixtures...
+    No fixtures found.
+
+This tells you that the test runner is creating a test database, as described
+in the previous section.
+
 Once the test database has been created, Django will run your tests.
 If everything goes well, you'll see something like this::
 
@@ -349,9 +359,6 @@
 feature is useful if you're using the test-runner script in a shell script and
 need to test for success or failure at that level.
 
-Regardless of whether the tests pass or fail, the test database is destroyed when
-all the tests have been executed.
-
 Testing tools
 =============