diff --git a/tests/databases/firebird-qb.php b/tests/databases/firebird/firebird-qb.php
similarity index 98%
rename from tests/databases/firebird-qb.php
rename to tests/databases/firebird/firebird-qb.php
index b7f7eb8..615dfe2 100644
--- a/tests/databases/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.php b/tests/databases/firebird/firebird.php
similarity index 98%
rename from tests/databases/firebird.php
rename to tests/databases/firebird/firebird.php
index 29c7abc..abb48f6 100644
--- a/tests/databases/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/mysql-qb.php b/tests/databases/mysql/mysql-qb.php
similarity index 100%
rename from tests/databases/mysql-qb.php
rename to tests/databases/mysql/mysql-qb.php
diff --git a/tests/databases/mysql.php b/tests/databases/mysql/mysql.php
similarity index 100%
rename from tests/databases/mysql.php
rename to tests/databases/mysql/mysql.php
diff --git a/tests/databases/odbc-qb.php b/tests/databases/odbc/odbc-qb.php
similarity index 100%
rename from tests/databases/odbc-qb.php
rename to tests/databases/odbc/odbc-qb.php
diff --git a/tests/databases/odbc.php b/tests/databases/odbc/odbc.php
similarity index 100%
rename from tests/databases/odbc.php
rename to tests/databases/odbc/odbc.php
diff --git a/tests/databases/pgsql-qb.php b/tests/databases/pgsql/pgsql-qb.php
similarity index 100%
rename from tests/databases/pgsql-qb.php
rename to tests/databases/pgsql/pgsql-qb.php
diff --git a/tests/databases/pgsql.php b/tests/databases/pgsql/pgsql.php
similarity index 100%
rename from tests/databases/pgsql.php
rename to tests/databases/pgsql/pgsql.php
diff --git a/tests/databases/sqlite-qb.php b/tests/databases/sqlite/sqlite-qb.php
similarity index 92%
rename from tests/databases/sqlite-qb.php
rename to tests/databases/sqlite/sqlite-qb.php
index f262666..ad62c12 100644
--- a/tests/databases/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.php b/tests/databases/sqlite/sqlite.php
similarity index 98%
rename from tests/databases/sqlite.php
rename to tests/databases/sqlite/sqlite.php
index 132d1e2..e2ffdfa 100644
--- a/tests/databases/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 99%
rename from tests/test_dbs/FB_TEST_DB.FDB
rename to tests/db_files/FB_TEST_DB.FDB
index 0312362..5e7cf0f 100755
Binary files a/tests/test_dbs/FB_TEST_DB.FDB and b/tests/db_files/FB_TEST_DB.FDB differ
diff --git a/tests/test_dbs/test_sqlite.db b/tests/db_files/test_sqlite.db
similarity index 95%
rename from tests/test_dbs/test_sqlite.db
rename to tests/db_files/test_sqlite.db
index ee1a11b..0f0f59b 100755
Binary files a/tests/test_dbs/test_sqlite.db and b/tests/db_files/test_sqlite.db differ
diff --git a/tests/index.php b/tests/index.php
index e07bb77..be02f10 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -47,14 +47,12 @@ foreach(pdo_drivers() as $d)
 	
 	if(is_dir($src_dir))
 	{
-		require_once("{$test_path}{$d}.php");
-		require_once("{$test_path}{$d}-qb.php");
+		array_map('do_include', glob("{$test_path}{$d}/{$d}*.php"));
 	}
 }
 
 // Load Firebird if there is support
 if(function_exists('fbird_connect'))
 {
-	require_once("{$test_path}firebird.php");
-	require_once("{$test_path}firebird-qb.php");
+	array_map('do_include', glob("{$test_path}/firebird/firebird*.php"));
 }
\ No newline at end of file