diff --git a/.bzrignore b/.bzrignore
index b15b324b1a..0dc1ca0dbf 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,6 +1,6 @@
 *.pyc
 glance.egg-info
-glance.sqlite
+tests.sqlite
 *.glance-venv
 dist/
 ChangeLog
diff --git a/run_tests.sh b/run_tests.sh
index d2659d9970..c0cd46c73a 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -39,7 +39,7 @@ done
 
 function run_tests {
   # Just run the test suites in current environment
-  ${wrapper} rm -f glance.sqlite
+  ${wrapper} rm -f tests.sqlite
   ${wrapper} $NOSETESTS 2> run_tests.err.log
 }
 
diff --git a/tests/functional/__init__.py b/tests/functional/__init__.py
index cb4596026d..d5d8b7d27a 100644
--- a/tests/functional/__init__.py
+++ b/tests/functional/__init__.py
@@ -53,7 +53,7 @@ def runs_sql(func):
         orig_sql_connection = test_obj.sql_connection
         try:
             if orig_sql_connection.startswith('sqlite'):
-                test_obj.sql_connection = "sqlite:///glance.sqlite"
+                test_obj.sql_connection = "sqlite:///tests.sqlite"
             func(*a, **kwargs)
         finally:
             test_obj.sql_connection = orig_sql_connection