diff --git a/autoload.php b/autoload.php
index 6099aa4..3f2c570 100644
--- a/autoload.php
+++ b/autoload.php
@@ -50,15 +50,16 @@ if ( ! function_exists('do_include'))
 function query_autoload($class)
 {
 	$class = strtolower($class);
-	
+
 	// Load Firebird separately
-	if ($class === 'firebird')
+	if (function_exists('fbird_connect') && $class === 'firebird')
 	{
+		array_map('do_include', glob(QDRIVER_PATH.'/firebird/*.php'));
 		return;
 	}
-	
+
 	$class_path = QBASE_PATH . "classes/{$class}.php";
-	
+
 	$driver_path = QDRIVER_PATH . "{$class}";
 
 	if (is_file($class_path))
@@ -77,12 +78,6 @@ function query_autoload($class)
 // Set up autoloader
 spl_autoload_register('query_autoload');
 
-// Load Firebird driver, if applicable
-if (function_exists('fbird_connect'))
-{
-	array_map('do_include', glob(QDRIVER_PATH.'/firebird/*.php'));
-}
-
 // --------------------------------------------------------------------------
 
 /**
diff --git a/tests/db_files/FB_TEST_DB.FDB b/tests/db_files/FB_TEST_DB.FDB
index fc75b05..6d4b150 100644
Binary files a/tests/db_files/FB_TEST_DB.FDB and b/tests/db_files/FB_TEST_DB.FDB differ