diff --git a/tests/cases/Database/Base.php b/tests/cases/Database/Base.php
new file mode 100644
index 0000000..711c3cc
--- /dev/null
+++ b/tests/cases/Database/Base.php
@@ -0,0 +1,167 @@
+<?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\TestCase\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;
+
+abstract class Base {
+    protected $drv;
+    protected $primed = false;
+
+    protected abstract function nextID(string $table): int;
+
+    public function setUp() {
+        // establish a clean baseline
+        $this->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;
+        $this->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 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.");
+        }
+    }
+}
diff --git a/tests/lib/Database/SeriesArticle.php b/tests/cases/Database/SeriesArticle.php
similarity index 100%
rename from tests/lib/Database/SeriesArticle.php
rename to tests/cases/Database/SeriesArticle.php
diff --git a/tests/lib/Database/SeriesCleanup.php b/tests/cases/Database/SeriesCleanup.php
similarity index 100%
rename from tests/lib/Database/SeriesCleanup.php
rename to tests/cases/Database/SeriesCleanup.php
diff --git a/tests/lib/Database/SeriesFeed.php b/tests/cases/Database/SeriesFeed.php
similarity index 100%
rename from tests/lib/Database/SeriesFeed.php
rename to tests/cases/Database/SeriesFeed.php
diff --git a/tests/lib/Database/SeriesFolder.php b/tests/cases/Database/SeriesFolder.php
similarity index 100%
rename from tests/lib/Database/SeriesFolder.php
rename to tests/cases/Database/SeriesFolder.php
diff --git a/tests/lib/Database/SeriesLabel.php b/tests/cases/Database/SeriesLabel.php
similarity index 100%
rename from tests/lib/Database/SeriesLabel.php
rename to tests/cases/Database/SeriesLabel.php
diff --git a/tests/lib/Database/SeriesMeta.php b/tests/cases/Database/SeriesMeta.php
similarity index 100%
rename from tests/lib/Database/SeriesMeta.php
rename to tests/cases/Database/SeriesMeta.php
diff --git a/tests/lib/Database/SeriesMiscellany.php b/tests/cases/Database/SeriesMiscellany.php
similarity index 100%
rename from tests/lib/Database/SeriesMiscellany.php
rename to tests/cases/Database/SeriesMiscellany.php
diff --git a/tests/lib/Database/SeriesSession.php b/tests/cases/Database/SeriesSession.php
similarity index 100%
rename from tests/lib/Database/SeriesSession.php
rename to tests/cases/Database/SeriesSession.php
diff --git a/tests/lib/Database/SeriesSubscription.php b/tests/cases/Database/SeriesSubscription.php
similarity index 100%
rename from tests/lib/Database/SeriesSubscription.php
rename to tests/cases/Database/SeriesSubscription.php
diff --git a/tests/lib/Database/SeriesUser.php b/tests/cases/Database/SeriesUser.php
similarity index 100%
rename from tests/lib/Database/SeriesUser.php
rename to tests/cases/Database/SeriesUser.php
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index e863737..343f381 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -64,27 +64,9 @@
     <!--<file>cases/Db/PostgreSQL/TestUpdate.php</file>-->
     </testsuite>
     <testsuite name="Database functions">
-        <file>cases/Db/SQLite3/Database/TestMiscellany.php</file>
-        <file>cases/Db/SQLite3/Database/TestMeta.php</file>
-        <file>cases/Db/SQLite3/Database/TestUser.php</file>
-        <file>cases/Db/SQLite3/Database/TestSession.php</file>
-        <file>cases/Db/SQLite3/Database/TestFolder.php</file>
-        <file>cases/Db/SQLite3/Database/TestFeed.php</file>
-        <file>cases/Db/SQLite3/Database/TestSubscription.php</file>
-        <file>cases/Db/SQLite3/Database/TestArticle.php</file>
-        <file>cases/Db/SQLite3/Database/TestLabel.php</file>
-        <file>cases/Db/SQLite3/Database/TestCleanup.php</file>
-
-        <file>cases/Db/SQLite3PDO/Database/TestMiscellany.php</file>
-        <file>cases/Db/SQLite3PDO/Database/TestMeta.php</file>
-        <file>cases/Db/SQLite3PDO/Database/TestUser.php</file>
-        <file>cases/Db/SQLite3PDO/Database/TestSession.php</file>
-        <file>cases/Db/SQLite3PDO/Database/TestFolder.php</file>
-        <file>cases/Db/SQLite3PDO/Database/TestFeed.php</file>
-        <file>cases/Db/SQLite3PDO/Database/TestSubscription.php</file>
-        <file>cases/Db/SQLite3PDO/Database/TestArticle.php</file>
-        <file>cases/Db/SQLite3PDO/Database/TestLabel.php</file>
-        <file>cases/Db/SQLite3PDO/Database/TestCleanup.php</file>
+        <file>cases/Db/SQLite3/TestDatabase.php</file>
+        <file>cases/Db/SQLite3PDO/TestDatabase.php</file>
+    <!--<file>cases/Db/PostgreSQL/TestDatabase.php</file>-->
     </testsuite>
     <testsuite name="REST">
         <file>cases/REST/TestTarget.php</file>