diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py
index 59839b090..575fefff6 100644
--- a/nova/tests/fake_flags.py
+++ b/nova/tests/fake_flags.py
@@ -39,6 +39,6 @@ FLAGS.num_shelves = 2
 FLAGS.blades_per_shelf = 4
 FLAGS.iscsi_num_targets = 8
 FLAGS.verbose = True
-FLAGS.sql_connection = 'sqlite:///nova.sqlite'
+FLAGS.sql_connection = 'sqlite:///tests.sqlite'
 FLAGS.use_ipv6 = True
-FLAGS.logfile = 'run_tests.err'
+FLAGS.logfile = 'tests.log'
diff --git a/run_tests.py b/run_tests.py
index bf12c62c6..274dc4a97 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -58,8 +58,8 @@ class NovaTestRunner(core.TextTestRunner):
 
 
 if __name__ == '__main__':
-    if os.path.exists("nova.sqlite"):
-        os.unlink("nova.sqlite")
+    if os.path.exists("tests.sqlite"):
+        os.unlink("tests.sqlite")
     c = config.Config(stream=sys.stdout,
                       env=os.environ,
                       verbosity=3,