diff --git a/lib/Database.php b/lib/Database.php
diff --git a/tests/DatabaseTest.php b/tests/DatabaseTest.php
@@ -3,12 +3,6 @@
 require_once ('lib/Database.php');
 
 class DatabaseTest extends PHPUnit_Framework_TestCase {
-	protected $backupGlobalsBlacklist = array ('db_list', 'db_err', 'db_sql', 'db_args');
-
-	static function setUpBeforeClass () {
-		$GLOBALS['db_list'] = array ();
-	}
-
 	function setUp () {
 		$this->bad_conf = array (
 			'master' => true,
@@ -29,32 +23,28 @@ function setUp () {
 		);
 	}
 
-	static function tearDownAfterClass () {
-		unset ($GLOBALS['db_list']);
-	}
-
 	function test_open () {
 		// test a bad connection
-		$this->assertFalse (db_open ($this->bad_conf));
+		$this->assertFalse (Database::open ($this->bad_conf));
 		$this->assertEquals ('could not find driver', db_error ());
-		$this->assertEquals (0, db_conn_count ());
+		$this->assertEquals (0, Database::count ());
 
 		// test a master connection
-		$this->assertTrue (db_open ($this->conf));
-		$this->assertEquals (1, db_conn_count ());
+		$this->assertTrue (Database::open ($this->conf));
+		$this->assertEquals (1, Database::count ());
 
 		// test a second connection
-		$this->assertTrue (db_open ($this->conf2));
-		$this->assertEquals (2, db_conn_count ());
-		unset ($GLOBALS['db_list']['slave_1']);
+		$this->assertTrue (Database::open ($this->conf2));
+		$this->assertEquals (2, Database::count ());
+		unset (Database::$connections['slave_1']);
 	}
 
 	function test_args () {
 		$cmp = array ('one', 'two');
 		$obj = (object) $cmp;
-		$this->assertEquals (db_args (array ('one', 'two')), $cmp);
-		$this->assertEquals (db_args (array (array ('one', 'two'))), $cmp);
-		$this->assertEquals (db_args (array ($obj)), $cmp);
+		$this->assertEquals (Database::args (array ('one', 'two')), $cmp);
+		$this->assertEquals (Database::args (array (array ('one', 'two'))), $cmp);
+		$this->assertEquals (Database::args (array ($obj)), $cmp);
 	}
 
 	function test_execute () {

diff --git a/tests/FormTest.php b/tests/FormTest.php
@@ -4,14 +4,10 @@
 require_once ('lib/Database.php');
 
 class FormTest extends PHPUnit_Framework_TestCase {
-	protected $backupGlobalsBlacklist = array ('db_list', 'db_err', 'db_sql', 'db_args', 'user');
+	protected $backupGlobalsBlacklist = array ('user');
 
 	static function setUpBeforeClass () {
-		db_open (array ('master' => true, 'driver' => 'sqlite', 'file' => ':memory:'));
-	}
-
-	static function tearDownAfterClass () {
-		unset ($GLOBALS['db_list']);
+		Database::open (array ('master' => true, 'driver' => 'sqlite', 'file' => ':memory:'));
 	}
 
 	function test_verify_value () {

diff --git a/tests/LockTest.php b/tests/LockTest.php
@@ -6,11 +6,11 @@
 $GLOBALS['db_list'] = array ();
 
 class LockTest extends PHPUnit_Framework_TestCase {
-	protected $backupGlobalsBlacklist = array ('db_list', 'db_err', 'db_sql', 'db_args', 'user');
+	protected $backupGlobalsBlacklist = array ('user');
 	protected static $lock;
 
 	static function setUpBeforeClass () {
-		db_open (array ('master' => true, 'driver' => 'sqlite', 'file' => ':memory:'));
+		Database::open (array ('master' => true, 'driver' => 'sqlite', 'file' => ':memory:'));
 		db_execute ('create table `lock` (
 			id integer primary key,
 			user int not null,
@@ -27,7 +27,6 @@ static function setUpBeforeClass () {
 	}
 
 	static function tearDownAfterClass () {
-		unset ($GLOBALS['db_list']);
 		unset ($GLOBALS['user']);
 	}
 

diff --git a/tests/ModelTest.php b/tests/ModelTest.php
@@ -16,20 +16,15 @@ class Bar extends Model {
 }
 
 class ModelTest extends PHPUnit_Framework_TestCase {
-	protected $backupGlobalsBlacklist = array ('db_list', 'db_err', 'db_sql', 'db_args');
 	protected static $q;
 
 	static function setUpBeforeClass () {
-		db_open (array ('master' => true, 'driver' => 'sqlite', 'file' => ':memory:'));
+		Database::open (array ('master' => true, 'driver' => 'sqlite', 'file' => ':memory:'));
 		db_execute ('create table qwerty ( foo char(12), bar char(12) )');
 
 		self::$q = new Qwerty ();
 	}
 
-	static function tearDownAfterClass () {
-		unset ($GLOBALS['db_list']);
-	}
-
 	function test_construct () {
 		self::$q->foo = 'asdf';
 		self::$q->bar = 'qwerty';

diff --git a/tests/VersionsTest.php b/tests/VersionsTest.php
@@ -8,10 +8,8 @@
 class Foobar extends Model {}
 
 class VersionsTest extends PHPUnit_Framework_TestCase {
-	protected $backupGlobalsBlacklist = array ('db_list', 'db_err', 'db_sql', 'db_args', 'user');
-
 	static function setUpBeforeClass () {
-		db_open (array ('master' => true, 'driver' => 'sqlite', 'file' => ':memory:'));
+		Database::open (array ('master' => true, 'driver' => 'sqlite', 'file' => ':memory:'));
 		db_execute ('create table foobar (id int not null, name char(32) not null)');
 		if (! db_execute ('create table versions (
 			id integer primary key,