diff --git a/.gitignore b/.gitignore
index 85dcae4..80e1afa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,6 @@
 *.DS_Store
 settings.json
 errors.txt
-tests/test_dbs/*
+tests/db_files/*
 test_config.json
 nbproject/*
\ No newline at end of file
diff --git a/tests/databases/firebird/firebird-qb.php b/tests/databases/firebird/firebird-qb.php
index 9c8a6be..880ad75 100644
--- a/tests/databases/firebird/firebird-qb.php
+++ b/tests/databases/firebird/firebird-qb.php
@@ -21,7 +21,7 @@ class FirebirdQBTest extends QBTest {
 	{
 		parent::__construct();
 		
-		$dbpath = TEST_DIR.DS.'test_dbs'.DS.'FB_TEST_DB.FDB';
+		$dbpath = TEST_DIR.DS.'db_files'.DS.'FB_TEST_DB.FDB';
 
 		// Test the query builder
 		$params = new Stdclass();
diff --git a/tests/databases/firebird/firebird.php b/tests/databases/firebird/firebird.php
index af1b8eb..7e27b15 100644
--- a/tests/databases/firebird/firebird.php
+++ b/tests/databases/firebird/firebird.php
@@ -21,7 +21,7 @@ class FirebirdTest extends DBTest {
 	
 	function setUp()
 	{
-		$dbpath = TEST_DIR.DS.'test_dbs'.DS.'FB_TEST_DB.FDB';
+		$dbpath = TEST_DIR.DS.'db_files'.DS.'FB_TEST_DB.FDB';
 		
 		// Test the db driver directly
 		$this->db = new Firebird('localhost:'.$dbpath);
diff --git a/tests/databases/sqlite/sqlite-qb.php b/tests/databases/sqlite/sqlite-qb.php
index f262666..ad62c12 100644
--- a/tests/databases/sqlite/sqlite-qb.php
+++ b/tests/databases/sqlite/sqlite-qb.php
@@ -21,7 +21,7 @@
  	{
  		parent::__construct();
  	
- 		$path = TEST_DIR.DS.'test_dbs'.DS.'test_sqlite.db';
+ 		$path = TEST_DIR.DS.'db_files'.DS.'test_sqlite.db';
 		$params = new Stdclass();
 		$params->type = 'sqlite';
 		$params->file = $path;
diff --git a/tests/databases/sqlite/sqlite.php b/tests/databases/sqlite/sqlite.php
index 132d1e2..e2ffdfa 100644
--- a/tests/databases/sqlite/sqlite.php
+++ b/tests/databases/sqlite/sqlite.php
@@ -26,7 +26,7 @@ class SQLiteTest extends UnitTestCase {
 
 	function setUp()
 	{
-		$path = TEST_DIR.DS.'test_dbs'.DS.'test_sqlite.db';
+		$path = TEST_DIR.DS.'db_files'.DS.'test_sqlite.db';
 		$this->db = new SQLite($path);
 	}
 
diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/db_files/FB_TEST_DB.FDB
similarity index 100%
rename from tests/test_dbs/FB_TEST_DB.FDB
rename to tests/db_files/FB_TEST_DB.FDB