diff --git a/tests/lib/Database/DriverSQLite3.php b/tests/lib/Database/DriverSQLite3.php
deleted file mode 100644
index 1b76eea..0000000
--- a/tests/lib/Database/DriverSQLite3.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/** @license MIT
- * Copyright 2017 J. King, Dustin Wilson et al.
- * See LICENSE and AUTHORS files for details */
-
-declare(strict_types=1);
-namespace JKingWeb\Arsse\Test\Database;
-
-use JKingWeb\Arsse\Arsse;
-use JKingWeb\Arsse\Db\SQLite3\Driver;
-
-trait DriverSQLite3 {
-    public function setUpDriver() {
-        if (!Driver::requirementsMet()) {
-            $this->markTestSkipped("SQLite extension not loaded");
-        }
-        Arsse::$conf->dbSQLite3File = ":memory:";
-        $this->drv = new Driver();
-    }
-
-    public function nextID(string $table): int {
-        return $this->drv->query("SELECT (case when max(id) then max(id) else 0 end)+1 from $table")->getValue();
-    }
-}
diff --git a/tests/lib/Database/DriverSQLite3PDO.php b/tests/lib/Database/DriverSQLite3PDO.php
deleted file mode 100644
index 9c52bd8..0000000
--- a/tests/lib/Database/DriverSQLite3PDO.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/** @license MIT
- * Copyright 2017 J. King, Dustin Wilson et al.
- * See LICENSE and AUTHORS files for details */
-
-declare(strict_types=1);
-namespace JKingWeb\Arsse\Test\Database;
-
-use JKingWeb\Arsse\Arsse;
-use JKingWeb\Arsse\Db\SQLite3\PDODriver;
-
-trait DriverSQLite3PDO {
-    public function setUpDriver() {
-        if (!PDODriver::requirementsMet()) {
-            $this->markTestSkipped("PDO-SQLite extension not loaded");
-        }
-        Arsse::$conf->dbSQLite3File = ":memory:";
-        $this->drv = new PDODriver();
-    }
-
-    public function nextID(string $table): int {
-        return (int) $this->drv->query("SELECT (case when max(id) then max(id) else 0 end)+1 from $table")->getValue();
-    }
-}
diff --git a/tests/lib/Database/Setup.php b/tests/lib/Database/Setup.php
deleted file mode 100644
index b3c749d..0000000
--- a/tests/lib/Database/Setup.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/** @license MIT
- * Copyright 2017 J. King, Dustin Wilson et al.
- * See LICENSE and AUTHORS files for details */
-
-declare(strict_types=1);
-namespace JKingWeb\Arsse\Test\Database;
-
-use JKingWeb\Arsse\User\Driver as UserDriver;
-use JKingWeb\Arsse\Arsse;
-use JKingWeb\Arsse\Conf;
-use JKingWeb\Arsse\User;
-use JKingWeb\Arsse\Misc\ValueInfo;
-use JKingWeb\Arsse\Test\Database;
-use JKingWeb\Arsse\Db\Result;
-use Phake;
-
-trait Setup {
-    protected $drv;
-    protected $primed = false;
-
-    public function setUp() {
-        // establish a clean baseline
-        self::clearData();
-        self::setConf();
-        // configure and create the relevant database driver
-        $this->setUpDriver();
-        // create the database interface with the suitable driver
-        Arsse::$db = new Database($this->drv);
-        Arsse::$db->driverSchemaUpdate();
-        // create a mock user manager
-        Arsse::$user = Phake::mock(User::class);
-        Phake::when(Arsse::$user)->authorize->thenReturn(true);
-        // call the additional setup method if it exists
-        if (method_exists($this, "setUpSeries")) {
-            $this->setUpSeries();
-        }
-        // prime the database with series data if it hasn't already been done
-        if (!$this->primed && isset($this->data)) {
-            $this->primeDatabase($this->data);
-        }
-    }
-
-    public function tearDown() {
-        // call the additional teardiwn method if it exists
-        if (method_exists($this, "tearDownSeries")) {
-            $this->tearDownSeries();
-        }
-        // clean up
-        $this->primed = false;
-        $this->drv = null;
-        self::clearData();
-    }
-
-    public function primeDatabase(array $data, \JKingWeb\Arsse\Db\Driver $drv = null): bool {
-        $drv = $drv ?? $this->drv;
-        $tr = $drv->begin();
-        foreach ($data as $table => $info) {
-            $cols = implode(",", array_keys($info['columns']));
-            $bindings = array_values($info['columns']);
-            $params = implode(",", array_fill(0, sizeof($info['columns']), "?"));
-            $s = $drv->prepareArray("INSERT INTO $table($cols) values($params)", $bindings);
-            foreach ($info['rows'] as $row) {
-                $s->runArray($row);
-            }
-        }
-        $tr->commit();
-        $this->primed = true;
-        return true;
-    }
-
-    public function primeFile(string $file, array $data = null): bool {
-        $data = $data ?? $this->data;
-        $primed = $this->primed;
-        $drv = new \JKingWeb\Arsse\Db\SQLite3\Driver($file);
-        $drv->schemaUpdate(\JKingWeb\Arsse\Database::SCHEMA_VERSION);
-        $this->primeDatabase($data, $drv);
-        $this->primed = $primed;
-        return true;
-    }
-
-    public function compareExpectations(array $expected): bool {
-        foreach ($expected as $table => $info) {
-            $cols = implode(",", array_keys($info['columns']));
-            $types = $info['columns'];
-            $data = $this->drv->prepare("SELECT $cols from $table")->run()->getAll();
-            $cols = array_keys($info['columns']);
-            foreach ($info['rows'] as $index => $row) {
-                $this->assertCount(sizeof($cols), $row, "The number of values for array index $index does not match the number of fields");
-                $row = array_combine($cols, $row);
-                foreach ($data as $index => $test) {
-                    foreach ($test as $col => $value) {
-                        switch ($types[$col]) {
-                            case "datetime":
-                                $test[$col] = $this->approximateTime($row[$col], $value);
-                                break;
-                            case "int":
-                                $test[$col] = ValueInfo::normalize($value, ValueInfo::T_INT | ValueInfo::M_DROP | valueInfo::M_NULL);
-                                break;
-                            case "float":
-                                $test[$col] = ValueInfo::normalize($value, ValueInfo::T_FLOAT | ValueInfo::M_DROP | valueInfo::M_NULL);
-                                break;
-                            case "bool":
-                                $test[$col] = (int) ValueInfo::normalize($value, ValueInfo::T_BOOL | ValueInfo::M_DROP | valueInfo::M_NULL);
-                                break;
-                        }
-                    }
-                    if ($row===$test) {
-                        $data[$index] = $test;
-                        break;
-                    }
-                }
-                $this->assertContains($row, $data, "Table $table does not contain record at array index $index.");
-                $found = array_search($row, $data, true);
-                unset($data[$found]);
-            }
-            $this->assertSame([], $data);
-        }
-        return true;
-    }
-
-    public function primeExpectations(array $source, array $tableSpecs = null): array {
-        $out = [];
-        foreach ($tableSpecs as $table => $columns) {
-            // make sure the source has the table we want
-            $this->assertArrayHasKey($table, $source, "Source for expectations does not contain requested table $table.");
-            $out[$table] = [
-                'columns' => [],
-                'rows'    => array_fill(0, sizeof($source[$table]['rows']), []),
-            ];
-            // make sure the source has all the columns we want for the table
-            $cols = array_flip($columns);
-            $cols = array_intersect_key($cols, $source[$table]['columns']);
-            $this->assertSame(array_keys($cols), $columns, "Source for table $table does not contain all requested columns");
-            // get a map of source value offsets and keys
-            $targets = array_flip(array_keys($source[$table]['columns']));
-            foreach ($cols as $key => $order) {
-                // fill the column-spec
-                $out[$table]['columns'][$key] = $source[$table]['columns'][$key];
-                foreach ($source[$table]['rows'] as $index => $row) {
-                    // fill each row column-wise with re-ordered values
-                    $out[$table]['rows'][$index][$order] = $row[$targets[$key]];
-                }
-            }
-        }
-        return $out;
-    }
-
-    public function assertResult(array $expected, Result $data) {
-        $data = $data->getAll();
-        $this->assertCount(sizeof($expected), $data, "Number of result rows (".sizeof($data).") differs from number of expected rows (".sizeof($expected).")");
-        if (sizeof($expected)) {
-            // make sure the expectations are consistent
-            foreach ($expected as $exp) {
-                if (!isset($keys)) {
-                    $keys = $exp;
-                    continue;
-                }
-                $this->assertSame(array_keys($keys), array_keys($exp), "Result set expectations are irregular");
-            }
-            // filter the result set to contain just the desired keys (we don't care if the result has extra keys)
-            $rows = [];
-            foreach ($data as $row) {
-                $rows[] = array_intersect_key($row, $keys);
-            }
-            // compare the result set to the expectations
-            foreach ($rows as $row) {
-                $this->assertContains($row, $expected, "Result set contains unexpected record.");
-                $found = array_search($row, $expected);
-                unset($expected[$found]);
-            }
-            $this->assertArraySubset($expected, [], "Expectations not in result set.");
-        }
-    }
-}