diff --git a/index.php b/index.php
index 969464d..f3bb420 100644
--- a/index.php
+++ b/index.php
@@ -90,13 +90,6 @@ $path = BASE_DIR . "/databases/";
 
 foreach(pdo_drivers() as $d)
 {
-
-	// Use the ibase_functions over PDO::Firebird, at least for now
-	if($d == 'firebird')
-	{
-		continue;
-	}
-
 	$file = "{$path}{$d}.php";
 	
 	if(is_file($file))
@@ -109,7 +102,7 @@ foreach(pdo_drivers() as $d)
 // Load Firebird if there is support
 if(function_exists('ibase_connect'))
 {
-	require_once("{$path}firebird.php");
+	require_once("{$path}firebird-ibase.php");
 	require_once("{$path}firebird_sql.php");
 }
 
diff --git a/tests/index.php b/tests/index.php
index 4bb1aa3..b37570d 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -55,7 +55,7 @@ foreach(pdo_drivers() as $d)
 // Load Firebird if there is support
 if(function_exists('ibase_connect') && ! in_array('firebird', pdo_drivers()))
 {
-	require_once("{$src_path}firebird-base.php");
+	require_once("{$src_path}firebird-ibase.php");
 	require_once("{$src_path}firebird_sql.php");
 	require_once("{$test_path}firebird.php");
 }
\ No newline at end of file
diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/test_dbs/FB_TEST_DB.FDB
index 08ff3cb..7e44e4f 100755
Binary files a/tests/test_dbs/FB_TEST_DB.FDB and b/tests/test_dbs/FB_TEST_DB.FDB differ