diff --git a/tests/cases/Db/SQLite3/TestDriver.php b/tests/cases/Db/SQLite3/TestDriver.php
index d2e602c..6453326 100644
--- a/tests/cases/Db/SQLite3/TestDriver.php
+++ b/tests/cases/Db/SQLite3/TestDriver.php
@@ -10,8 +10,8 @@ use JKingWeb\Arsse\Arsse;
 use JKingWeb\Arsse\Conf;
 use JKingWeb\Arsse\Database;
 use JKingWeb\Arsse\Db\SQLite3\Driver;
-use JKingWeb\Arsse\Db\SQLite3\Result;
-use JKingWeb\Arsse\Db\SQLite3\Statement;
+use JKingWeb\Arsse\Db\Result;
+use JKingWeb\Arsse\Db\Statement;
 
 /**
  * @covers \JKingWeb\Arsse\Db\SQLite3\Driver<extended>
@@ -22,7 +22,7 @@ class TestDriver extends \JKingWeb\Arsse\Test\AbstractTest {
     protected $ch;
 
     public function setUp() {
-        if (!Db\SQLite3\Driver::requirementsMet()) {
+        if (!Driver::requirementsMet()) {
             $this->markTestSkipped("SQLite extension not loaded");
         }
         $this->clearData();
diff --git a/tests/cases/Db/SQLite3/TestResult.php b/tests/cases/Db/SQLite3/TestResult.php
index 3b841f1..7c302a6 100644
--- a/tests/cases/Db/SQLite3/TestResult.php
+++ b/tests/cases/Db/SQLite3/TestResult.php
@@ -13,10 +13,10 @@ class TestResult extends \JKingWeb\Arsse\Test\AbstractTest {
     protected $c;
 
     public function setUp() {
-        $this->clearData();
-        if (!Db\SQLite3\Driver::requirementsMet()) {
+        if (!\JKingWeb\Arsse\Db\SQLite3\Driver::requirementsMet()) {
             $this->markTestSkipped("SQLite extension not loaded");
         }
+        $this->clearData();
         $c = new \SQLite3(":memory:");
         $c->enableExceptions(true);
         $this->c = $c;
diff --git a/tests/cases/Db/SQLite3/TestStatement.php b/tests/cases/Db/SQLite3/TestStatement.php
index 7e722c2..b139f08 100644
--- a/tests/cases/Db/SQLite3/TestStatement.php
+++ b/tests/cases/Db/SQLite3/TestStatement.php
@@ -18,10 +18,10 @@ class TestStatement extends \JKingWeb\Arsse\Test\AbstractTest {
     protected static $imp = \JKingWeb\Arsse\Db\SQLite3\Statement::class;
 
     public function setUp() {
-        $this->clearData();
-        if (!extension_loaded("sqlite3")) {
+        if (!\JKingWeb\Arsse\Db\SQLite3\Driver::requirementsMet()) {
             $this->markTestSkipped("SQLite extension not loaded");
         }
+        $this->clearData();
         $c = new \SQLite3(":memory:");
         $c->enableExceptions(true);
         $this->c = $c;
diff --git a/tests/cases/Db/SQLite3/TestUpdate.php b/tests/cases/Db/SQLite3/TestUpdate.php
index 3767d75..d6c8fc3 100644
--- a/tests/cases/Db/SQLite3/TestUpdate.php
+++ b/tests/cases/Db/SQLite3/TestUpdate.php
@@ -26,7 +26,7 @@ class TestUpdate extends \JKingWeb\Arsse\Test\AbstractTest {
     const MINIMAL2 = "pragma user_version=2";
 
     public function setUp(Conf $conf = null) {
-        if (!extension_loaded("sqlite3")) {
+        if (!Driver::requirementsMet()) {
             $this->markTestSkipped("SQLite extension not loaded");
         }
         $this->clearData();
diff --git a/tests/cases/Db/SQLite3PDO/Database/TestArticle.php b/tests/cases/Db/SQLite3PDO/Database/TestArticle.php
new file mode 100644
index 0000000..ac63498
--- /dev/null
+++ b/tests/cases/Db/SQLite3PDO/Database/TestArticle.php
@@ -0,0 +1,14 @@
+<?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\Db\SQLite3PDO\Database;
+
+/** @covers \JKingWeb\Arsse\Database<extended> */
+class TestArticle extends \JKingWeb\Arsse\Test\AbstractTest {
+    use \JKingWeb\Arsse\Test\Database\Setup;
+    use \JKingWeb\Arsse\Test\Database\DriverSQLite3PDO;
+    use \JKingWeb\Arsse\Test\Database\SeriesArticle;
+}
diff --git a/tests/cases/Db/SQLite3PDO/Database/TestCleanup.php b/tests/cases/Db/SQLite3PDO/Database/TestCleanup.php
new file mode 100644
index 0000000..76e4530
--- /dev/null
+++ b/tests/cases/Db/SQLite3PDO/Database/TestCleanup.php
@@ -0,0 +1,14 @@
+<?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\Db\SQLite3PDO\Database;
+
+/** @covers \JKingWeb\Arsse\Database<extended> */
+class TestCleanup extends \JKingWeb\Arsse\Test\AbstractTest {
+    use \JKingWeb\Arsse\Test\Database\Setup;
+    use \JKingWeb\Arsse\Test\Database\DriverSQLite3PDO;
+    use \JKingWeb\Arsse\Test\Database\SeriesCleanup;
+}
diff --git a/tests/cases/Db/SQLite3PDO/Database/TestDatabaseArticleSQLite3PDO.php b/tests/cases/Db/SQLite3PDO/Database/TestDatabaseArticleSQLite3PDO.php
deleted file mode 100644
index a904781..0000000
--- a/tests/cases/Db/SQLite3PDO/Database/TestDatabaseArticleSQLite3PDO.php
+++ /dev/null
@@ -1,16 +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;
-
-/** 
- * @covers \JKingWeb\Arsse\Database<extended> 
- * @group optional */
-class TestDatabaseArticleSQLite3PDO extends Test\AbstractTest {
-    use Test\Database\Setup;
-    use Test\Database\DriverSQLite3PDO;
-    use Test\Database\SeriesArticle;
-}
diff --git a/tests/cases/Db/SQLite3PDO/Database/TestDatabaseCleanupSQLite3PDO.php b/tests/cases/Db/SQLite3PDO/Database/TestDatabaseCleanupSQLite3PDO.php
deleted file mode 100644
index 8eb5ef7..0000000
--- a/tests/cases/Db/SQLite3PDO/Database/TestDatabaseCleanupSQLite3PDO.php
+++ /dev/null
@@ -1,16 +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;
-
-/** 
- * @covers \JKingWeb\Arsse\Database<extended> 
- * @group optional */
-class TestDatabaseCleanupSQLite3PDO extends Test\AbstractTest {
-    use Test\Database\Setup;
-    use Test\Database\DriverSQLite3PDO;
-    use Test\Database\SeriesCleanup;
-}
diff --git a/tests/cases/Db/SQLite3PDO/Database/TestDatabaseFeedSQLite3PDO.php b/tests/cases/Db/SQLite3PDO/Database/TestDatabaseFeedSQLite3PDO.php
deleted file mode 100644
index 07ed2ab..0000000
--- a/tests/cases/Db/SQLite3PDO/Database/TestDatabaseFeedSQLite3PDO.php
+++ /dev/null
@@ -1,16 +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;
-
-/** 
- * @covers \JKingWeb\Arsse\Database<extended> 
- * @group optional */
-class TestDatabaseFeedSQLite3PDO extends Test\AbstractTest {
-    use Test\Database\Setup;
-    use Test\Database\DriverSQLite3PDO;
-    use Test\Database\SeriesFeed;
-}
diff --git a/tests/cases/Db/SQLite3PDO/Database/TestDatabaseFolderSQLite3PDO.php b/tests/cases/Db/SQLite3PDO/Database/TestDatabaseFolderSQLite3PDO.php
deleted file mode 100644
index d348de9..0000000
--- a/tests/cases/Db/SQLite3PDO/Database/TestDatabaseFolderSQLite3PDO.php
+++ /dev/null
@@ -1,16 +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;
-
-/** 
- * @covers \JKingWeb\Arsse\Database<extended> 
- * @group optional */
-class TestDatabaseFolderSQLite3PDO extends Test\AbstractTest {
-    use Test\Database\Setup;
-    use Test\Database\DriverSQLite3PDO;
-    use Test\Database\SeriesFolder;
-}
diff --git a/tests/cases/Db/SQLite3PDO/Database/TestDatabaseLabelSQLite3PDO.php b/tests/cases/Db/SQLite3PDO/Database/TestDatabaseLabelSQLite3PDO.php
deleted file mode 100644
index 3d367af..0000000
--- a/tests/cases/Db/SQLite3PDO/Database/TestDatabaseLabelSQLite3PDO.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-declare(strict_types=1);
-namespace JKingWeb\Arsse;
-
-/** 
- * @covers \JKingWeb\Arsse\Database<extended> 
- * @group optional */
-class TestDatabaseLabelSQLite3PDO extends Test\AbstractTest {
-    use Test\Database\Setup;
-    use Test\Database\DriverSQLite3PDO;
-    use Test\Database\SeriesLabel;
-}
diff --git a/tests/cases/Db/SQLite3PDO/Database/TestDatabaseMetaSQLite3PDO.php b/tests/cases/Db/SQLite3PDO/Database/TestDatabaseMetaSQLite3PDO.php
deleted file mode 100644
index 8f8ad5e..0000000
--- a/tests/cases/Db/SQLite3PDO/Database/TestDatabaseMetaSQLite3PDO.php
+++ /dev/null
@@ -1,16 +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;
-
-/** 
- * @covers \JKingWeb\Arsse\Database<extended> 
- * @group optional */
-class TestDatabaseMetaSQLite3PDO extends Test\AbstractTest {
-    use Test\Database\Setup;
-    use Test\Database\DriverSQLite3PDO;
-    use Test\Database\SeriesMeta;
-}
diff --git a/tests/cases/Db/SQLite3PDO/Database/TestDatabaseMiscellanySQLite3PDO.php b/tests/cases/Db/SQLite3PDO/Database/TestDatabaseMiscellanySQLite3PDO.php
deleted file mode 100644
index 2e1d01e..0000000
--- a/tests/cases/Db/SQLite3PDO/Database/TestDatabaseMiscellanySQLite3PDO.php
+++ /dev/null
@@ -1,16 +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;
-
-/** 
- * @covers \JKingWeb\Arsse\Database<extended> 
- * @group optional */
-class TestDatabaseMiscellanySQLite3PDO extends Test\AbstractTest {
-    use Test\Database\Setup;
-    use Test\Database\DriverSQLite3PDO;
-    use Test\Database\SeriesMiscellany;
-}
diff --git a/tests/cases/Db/SQLite3PDO/Database/TestDatabaseSessionSQLite3PDO.php b/tests/cases/Db/SQLite3PDO/Database/TestDatabaseSessionSQLite3PDO.php
deleted file mode 100644
index bd0a857..0000000
--- a/tests/cases/Db/SQLite3PDO/Database/TestDatabaseSessionSQLite3PDO.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-declare(strict_types=1);
-namespace JKingWeb\Arsse;
-
-/** 
- * @covers \JKingWeb\Arsse\Database<extended> 
- * @group optional */
-class TestDatabaseSessionSQLite3PDO extends Test\AbstractTest {
-    use Test\Database\Setup;
-    use Test\Database\DriverSQLite3PDO;
-    use Test\Database\SeriesSession;
-}
diff --git a/tests/cases/Db/SQLite3PDO/Database/TestDatabaseSubscriptionSQLite3PDO.php b/tests/cases/Db/SQLite3PDO/Database/TestDatabaseSubscriptionSQLite3PDO.php
deleted file mode 100644
index 99ec86c..0000000
--- a/tests/cases/Db/SQLite3PDO/Database/TestDatabaseSubscriptionSQLite3PDO.php
+++ /dev/null
@@ -1,16 +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;
-
-/** 
- * @covers \JKingWeb\Arsse\Database<extended> 
- * @group optional */
-class TestDatabaseSubscriptionSQLite3PDO extends Test\AbstractTest {
-    use Test\Database\Setup;
-    use Test\Database\DriverSQLite3PDO;
-    use Test\Database\SeriesSubscription;
-}
diff --git a/tests/cases/Db/SQLite3PDO/Database/TestDatabaseUserSQLite3PDO.php b/tests/cases/Db/SQLite3PDO/Database/TestDatabaseUserSQLite3PDO.php
deleted file mode 100644
index ef5ec44..0000000
--- a/tests/cases/Db/SQLite3PDO/Database/TestDatabaseUserSQLite3PDO.php
+++ /dev/null
@@ -1,16 +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;
-
-/** 
- * @covers \JKingWeb\Arsse\Database<extended> 
- * @group optional */
-class TestDatabaseUserSQLite3PDO extends Test\AbstractTest {
-    use Test\Database\Setup;
-    use Test\Database\DriverSQLite3PDO;
-    use Test\Database\SeriesUser;
-}
diff --git a/tests/cases/Db/SQLite3PDO/Database/TestFeed.php b/tests/cases/Db/SQLite3PDO/Database/TestFeed.php
new file mode 100644
index 0000000..9ffc733
--- /dev/null
+++ b/tests/cases/Db/SQLite3PDO/Database/TestFeed.php
@@ -0,0 +1,14 @@
+<?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\Db\SQLite3PDO\Database;
+
+/** @covers \JKingWeb\Arsse\Database<extended> */
+class TestFeed extends \JKingWeb\Arsse\Test\AbstractTest {
+    use \JKingWeb\Arsse\Test\Database\Setup;
+    use \JKingWeb\Arsse\Test\Database\DriverSQLite3PDO;
+    use \JKingWeb\Arsse\Test\Database\SeriesFeed;
+}
diff --git a/tests/cases/Db/SQLite3PDO/Database/TestFolder.php b/tests/cases/Db/SQLite3PDO/Database/TestFolder.php
new file mode 100644
index 0000000..30cff60
--- /dev/null
+++ b/tests/cases/Db/SQLite3PDO/Database/TestFolder.php
@@ -0,0 +1,14 @@
+<?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\Db\SQLite3PDO\Database;
+
+/** @covers \JKingWeb\Arsse\Database<extended> */
+class TestFolder extends \JKingWeb\Arsse\Test\AbstractTest {
+    use \JKingWeb\Arsse\Test\Database\Setup;
+    use \JKingWeb\Arsse\Test\Database\DriverSQLite3PDO;
+    use \JKingWeb\Arsse\Test\Database\SeriesFolder;
+}
diff --git a/tests/cases/Db/SQLite3PDO/Database/TestLabel.php b/tests/cases/Db/SQLite3PDO/Database/TestLabel.php
new file mode 100644
index 0000000..38bd123
--- /dev/null
+++ b/tests/cases/Db/SQLite3PDO/Database/TestLabel.php
@@ -0,0 +1,10 @@
+<?php
+declare(strict_types=1);
+namespace JKingWeb\Arsse\TestCase\Db\SQLite3PDO\Database;
+
+/** @covers \JKingWeb\Arsse\Database<extended> */
+class TestLabel extends \JKingWeb\Arsse\Test\AbstractTest {
+    use \JKingWeb\Arsse\Test\Database\Setup;
+    use \JKingWeb\Arsse\Test\Database\DriverSQLite3PDO;
+    use \JKingWeb\Arsse\Test\Database\SeriesLabel;
+}
diff --git a/tests/cases/Db/SQLite3PDO/Database/TestMeta.php b/tests/cases/Db/SQLite3PDO/Database/TestMeta.php
new file mode 100644
index 0000000..7d3e7ed
--- /dev/null
+++ b/tests/cases/Db/SQLite3PDO/Database/TestMeta.php
@@ -0,0 +1,14 @@
+<?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\Db\SQLite3PDO\Database;
+
+/** @covers \JKingWeb\Arsse\Database<extended> */
+class TestMeta extends \JKingWeb\Arsse\Test\AbstractTest {
+    use \JKingWeb\Arsse\Test\Database\Setup;
+    use \JKingWeb\Arsse\Test\Database\DriverSQLite3PDO;
+    use \JKingWeb\Arsse\Test\Database\SeriesMeta;
+}
diff --git a/tests/cases/Db/SQLite3PDO/Database/TestMiscellany.php b/tests/cases/Db/SQLite3PDO/Database/TestMiscellany.php
new file mode 100644
index 0000000..cc8ca60
--- /dev/null
+++ b/tests/cases/Db/SQLite3PDO/Database/TestMiscellany.php
@@ -0,0 +1,14 @@
+<?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\Db\SQLite3PDO\Database;
+
+/** @covers \JKingWeb\Arsse\Database<extended> */
+class TestMiscellany extends \JKingWeb\Arsse\Test\AbstractTest {
+    use \JKingWeb\Arsse\Test\Database\Setup;
+    use \JKingWeb\Arsse\Test\Database\DriverSQLite3PDO;
+    use \JKingWeb\Arsse\Test\Database\SeriesMiscellany;
+}
diff --git a/tests/cases/Db/SQLite3PDO/Database/TestSession.php b/tests/cases/Db/SQLite3PDO/Database/TestSession.php
new file mode 100644
index 0000000..dbc71fb
--- /dev/null
+++ b/tests/cases/Db/SQLite3PDO/Database/TestSession.php
@@ -0,0 +1,10 @@
+<?php
+declare(strict_types=1);
+namespace JKingWeb\Arsse\TestCase\Db\SQLite3PDO\Database;
+
+/** @covers \JKingWeb\Arsse\Database<extended> */
+class TestSession extends \JKingWeb\Arsse\Test\AbstractTest {
+    use \JKingWeb\Arsse\Test\Database\Setup;
+    use \JKingWeb\Arsse\Test\Database\DriverSQLite3PDO;
+    use \JKingWeb\Arsse\Test\Database\SeriesSession;
+}
diff --git a/tests/cases/Db/SQLite3PDO/Database/TestSubscription.php b/tests/cases/Db/SQLite3PDO/Database/TestSubscription.php
new file mode 100644
index 0000000..0205b48
--- /dev/null
+++ b/tests/cases/Db/SQLite3PDO/Database/TestSubscription.php
@@ -0,0 +1,14 @@
+<?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\Db\SQLite3PDO\Database;
+
+/** @covers \JKingWeb\Arsse\Database<extended> */
+class TestSubscription extends \JKingWeb\Arsse\Test\AbstractTest {
+    use \JKingWeb\Arsse\Test\Database\Setup;
+    use \JKingWeb\Arsse\Test\Database\DriverSQLite3PDO;
+    use \JKingWeb\Arsse\Test\Database\SeriesSubscription;
+}
diff --git a/tests/cases/Db/SQLite3PDO/Database/TestUser.php b/tests/cases/Db/SQLite3PDO/Database/TestUser.php
new file mode 100644
index 0000000..b77822d
--- /dev/null
+++ b/tests/cases/Db/SQLite3PDO/Database/TestUser.php
@@ -0,0 +1,14 @@
+<?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\Db\SQLite3PDO\Database;
+
+/** @covers \JKingWeb\Arsse\Database<extended> */
+class TestUser extends \JKingWeb\Arsse\Test\AbstractTest {
+    use \JKingWeb\Arsse\Test\Database\Setup;
+    use \JKingWeb\Arsse\Test\Database\DriverSQLite3PDO;
+    use \JKingWeb\Arsse\Test\Database\SeriesUser;
+}
diff --git a/tests/cases/Db/SQLite3PDO/TestDbDriverCreationSQLite3PDO.php b/tests/cases/Db/SQLite3PDO/TestCreation.php
similarity index 97%
rename from tests/cases/Db/SQLite3PDO/TestDbDriverCreationSQLite3PDO.php
rename to tests/cases/Db/SQLite3PDO/TestCreation.php
index 436d4e2..34cb824 100644
--- a/tests/cases/Db/SQLite3PDO/TestDbDriverCreationSQLite3PDO.php
+++ b/tests/cases/Db/SQLite3PDO/TestCreation.php
@@ -4,9 +4,10 @@
  * See LICENSE and AUTHORS files for details */
 
 declare(strict_types=1);
-namespace JKingWeb\Arsse;
+namespace JKingWeb\Arsse\TestCase\Db\SQLite3PDO;
 
 use JKingWeb\Arsse\Arsse;
+use JKingWeb\Arsse\Conf;
 use JKingWeb\Arsse\Db\SQLite3\PDODriver as Driver;
 use org\bovigo\vfs\vfsStream;
 use Phake;
@@ -15,7 +16,7 @@ use Phake;
  * @covers \JKingWeb\Arsse\Db\SQLite3\PDODriver<extended>
  * @covers \JKingWeb\Arsse\Db\PDODriver
  * @covers \JKingWeb\Arsse\Db\PDOError */
-class TestDbDriverCreationSQLite3PDO extends Test\AbstractTest {
+class TestCreation extends \JKingWeb\Arsse\Test\AbstractTest {
     protected $data;
     protected $drv;
     protected $ch;
diff --git a/tests/cases/Db/SQLite3PDO/TestDbDriverSQLite3PDO.php b/tests/cases/Db/SQLite3PDO/TestDriver.php
similarity index 96%
rename from tests/cases/Db/SQLite3PDO/TestDbDriverSQLite3PDO.php
rename to tests/cases/Db/SQLite3PDO/TestDriver.php
index bb96112..1fec09c 100644
--- a/tests/cases/Db/SQLite3PDO/TestDbDriverSQLite3PDO.php
+++ b/tests/cases/Db/SQLite3PDO/TestDriver.php
@@ -4,28 +4,35 @@
  * See LICENSE and AUTHORS files for details */
 
 declare(strict_types=1);
-namespace JKingWeb\Arsse;
+namespace JKingWeb\Arsse\TestCase\Db\SQLite3PDO;
+
+use JKingWeb\Arsse\Arsse;
+use JKingWeb\Arsse\Conf;
+use JKingWeb\Arsse\Database;
+use JKingWeb\Arsse\Db\SQLite3\PDODriver;
+use JKingWeb\Arsse\Db\Result;
+use JKingWeb\Arsse\Db\Statement;
 
 /**
  * @covers \JKingWeb\Arsse\Db\SQLite3\PDODriver<extended>
  * @covers \JKingWeb\Arsse\Db\PDODriver
  * @covers \JKingWeb\Arsse\Db\PDOError */
-class TestDbDriverSQLite3PDO extends Test\AbstractTest {
+class TestDriver extends \JKingWeb\Arsse\Test\AbstractTest {
     protected $data;
     protected $drv;
     protected $ch;
 
     public function setUp() {
-        if (!Db\SQLite3\PDODriver::requirementsMet()) {
+        if (!PDODriver::requirementsMet()) {
             $this->markTestSkipped("PDO-SQLite extension not loaded");
         }
         $this->clearData();
         $conf = new Conf();
         Arsse::$conf = $conf;
-        $conf->dbDriver = Db\SQLite3\PDODriver::class;
+        $conf->dbDriver = PDODriver::class;
         $conf->dbSQLite3Timeout = 0;
         $conf->dbSQLite3File = tempnam(sys_get_temp_dir(), 'ook');
-        $this->drv = new Db\SQLite3\PDODriver();
+        $this->drv = new PDODriver();
         $this->ch = new \PDO("sqlite:".Arsse::$conf->dbSQLite3File, "", "", [\PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION]);
     }
 
@@ -80,7 +87,7 @@ class TestDbDriverSQLite3PDO extends Test\AbstractTest {
     }
 
     public function testMakeAValidQuery() {
-        $this->assertInstanceOf(Db\Result::class, $this->drv->query("SELECT 1"));
+        $this->assertInstanceOf(Result::class, $this->drv->query("SELECT 1"));
     }
 
     public function testMakeAnInvalidQuery() {
@@ -108,7 +115,7 @@ class TestDbDriverSQLite3PDO extends Test\AbstractTest {
 
     public function testPrepareAValidQuery() {
         $s = $this->drv->prepare("SELECT ?, ?", "int", "int");
-        $this->assertInstanceOf(Db\Statement::class, $s);
+        $this->assertInstanceOf(Statement::class, $s);
     }
 
     public function testPrepareAnInvalidQuery() {
diff --git a/tests/cases/Db/SQLite3PDO/TestDbResultSQLite3PDO.php b/tests/cases/Db/SQLite3PDO/TestResult.php
similarity index 84%
rename from tests/cases/Db/SQLite3PDO/TestDbResultSQLite3PDO.php
rename to tests/cases/Db/SQLite3PDO/TestResult.php
index fbc745f..7537b87 100644
--- a/tests/cases/Db/SQLite3PDO/TestDbResultSQLite3PDO.php
+++ b/tests/cases/Db/SQLite3PDO/TestResult.php
@@ -4,17 +4,21 @@
  * See LICENSE and AUTHORS files for details */
 
 declare(strict_types=1);
-namespace JKingWeb\Arsse;
+namespace JKingWeb\Arsse\TestCase\Db\SQLite3PDO;
+
+use JKingWeb\Arsse\Db\Result;
+use JKingWeb\Arsse\Db\PDOResult;
+use JKingWeb\Arsse\Db\SQLite3\PDODriver;
 
 /** @covers \JKingWeb\Arsse\Db\PDOResult<extended> */
-class TestDbResultSQLite3PDO extends Test\AbstractTest {
+class TestResult extends \JKingWeb\Arsse\Test\AbstractTest {
     protected $c;
 
     public function setUp() {
-        $this->clearData();
-        if (!Db\SQLite3\PDODriver::requirementsMet()) {
+        if (!PDODriver::requirementsMet()) {
             $this->markTestSkipped("PDO-SQLite extension not loaded");
         }
+        $this->clearData();
         $c = new \PDO("sqlite::memory:", "", "", [\PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION]);
         $this->c = $c;
     }
@@ -26,7 +30,7 @@ class TestDbResultSQLite3PDO extends Test\AbstractTest {
 
     public function testConstructResult() {
         $set = $this->c->query("SELECT 1");
-        $this->assertInstanceOf(Db\Result::class, new Db\PDOResult($set));
+        $this->assertInstanceOf(Result::class, new PDOResult($set));
     }
 
     public function testGetChangeCountAndLastInsertId() {
@@ -34,7 +38,7 @@ class TestDbResultSQLite3PDO extends Test\AbstractTest {
         $set = $this->c->query("INSERT INTO test(col) values(1)");
         $rows = $set->rowCount();
         $id = $this->c->lastInsertID();
-        $r = new Db\PDOResult($set, [$rows,$id]);
+        $r = new PDOResult($set, [$rows,$id]);
         $this->assertSame((int) $rows, $r->changes());
         $this->assertSame((int) $id, $r->lastId());
     }
@@ -42,7 +46,7 @@ class TestDbResultSQLite3PDO extends Test\AbstractTest {
     public function testIterateOverResults() {
         $set = $this->c->query("SELECT 1 as col union select 2 as col union select 3 as col");
         $rows = [];
-        foreach (new Db\PDOResult($set) as $index => $row) {
+        foreach (new PDOResult($set) as $index => $row) {
             $rows[$index] = $row['col'];
         }
         $this->assertSame([0 => "1", 1 => "2", 2 => "3"], $rows);
@@ -51,7 +55,7 @@ class TestDbResultSQLite3PDO extends Test\AbstractTest {
     public function testIterateOverResultsTwice() {
         $set = $this->c->query("SELECT 1 as col union select 2 as col union select 3 as col");
         $rows = [];
-        $test = new Db\PDOResult($set);
+        $test = new PDOResult($set);
         foreach ($test as $row) {
             $rows[] = $row['col'];
         }
@@ -64,7 +68,7 @@ class TestDbResultSQLite3PDO extends Test\AbstractTest {
 
     public function testGetSingleValues() {
         $set = $this->c->query("SELECT 1867 as year union select 1970 as year union select 2112 as year");
-        $test = new Db\PDOResult($set);
+        $test = new PDOResult($set);
         $this->assertEquals(1867, $test->getValue());
         $this->assertEquals(1970, $test->getValue());
         $this->assertEquals(2112, $test->getValue());
@@ -73,7 +77,7 @@ class TestDbResultSQLite3PDO extends Test\AbstractTest {
 
     public function testGetFirstValuesOnly() {
         $set = $this->c->query("SELECT 1867 as year, 19 as century union select 1970 as year, 20 as century union select 2112 as year, 22 as century");
-        $test = new Db\PDOResult($set);
+        $test = new PDOResult($set);
         $this->assertEquals(1867, $test->getValue());
         $this->assertEquals(1970, $test->getValue());
         $this->assertEquals(2112, $test->getValue());
@@ -86,7 +90,7 @@ class TestDbResultSQLite3PDO extends Test\AbstractTest {
             ['album' => '2112',             'track' => '2112'],
             ['album' => 'Clockwork Angels', 'track' => 'The Wreckers'],
         ];
-        $test = new Db\PDOResult($set);
+        $test = new PDOResult($set);
         $this->assertEquals($rows[0], $test->getRow());
         $this->assertEquals($rows[1], $test->getRow());
         $this->assertSame(null, $test->getRow());
@@ -98,7 +102,7 @@ class TestDbResultSQLite3PDO extends Test\AbstractTest {
             ['album' => '2112',             'track' => '2112'],
             ['album' => 'Clockwork Angels', 'track' => 'The Wreckers'],
         ];
-        $test = new Db\PDOResult($set);
+        $test = new PDOResult($set);
         $this->assertEquals($rows, $test->getAll());
     }
 }
diff --git a/tests/cases/Db/SQLite3PDO/TestDbStatementSQLite3PDO.php b/tests/cases/Db/SQLite3PDO/TestStatement.php
similarity index 90%
rename from tests/cases/Db/SQLite3PDO/TestDbStatementSQLite3PDO.php
rename to tests/cases/Db/SQLite3PDO/TestStatement.php
index 76ca24a..d9d6b02 100644
--- a/tests/cases/Db/SQLite3PDO/TestDbStatementSQLite3PDO.php
+++ b/tests/cases/Db/SQLite3PDO/TestStatement.php
@@ -4,23 +4,25 @@
  * See LICENSE and AUTHORS files for details */
 
 declare(strict_types=1);
-namespace JKingWeb\Arsse;
+namespace JKingWeb\Arsse\TestCase\Db\SQLite3PDO;
 
 use JKingWeb\Arsse\Db\Statement;
+use JKingWeb\Arsse\Db\PDOStatement;
+use JKingWeb\Arsse\Db\SQLite3\PDODriver;
 
 /**
  * @covers \JKingWeb\Arsse\Db\PDOStatement<extended>
  * @covers \JKingWeb\Arsse\Db\PDOError */
-class TestDbStatementSQLite3PDO extends Test\AbstractTest {
+class TestStatement extends \JKingWeb\Arsse\Test\AbstractTest {
 
     protected $c;
-    protected static $imp = Db\PDOStatement::class;
+    protected static $imp = \JKingWeb\Arsse\Db\PDOStatement::class;
 
     public function setUp() {
-        $this->clearData();
-        if (!Db\SQLite3\PDODriver::requirementsMet()) {
+        if (!PDODriver::requirementsMet()) {
             $this->markTestSkipped("PDO-SQLite extension not loaded");
         }
+        $this->clearData();
         $c = new \PDO("sqlite::memory:", "", "", [\PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION]);
         $this->c = $c;
     }
@@ -46,7 +48,7 @@ class TestDbStatementSQLite3PDO extends Test\AbstractTest {
 
     public function testConstructStatement() {
         $nativeStatement = $this->c->prepare("SELECT ? as value");
-        $this->assertInstanceOf(Statement::class, new Db\PDOStatement($this->c, $nativeStatement));
+        $this->assertInstanceOf(Statement::class, new PDOStatement($this->c, $nativeStatement));
     }
 
     public function testBindMissingValue() {
diff --git a/tests/cases/Db/SQLite3PDO/TestDbUpdateSQLite3PDO.php b/tests/cases/Db/SQLite3PDO/TestUpdate.php
similarity index 90%
rename from tests/cases/Db/SQLite3PDO/TestDbUpdateSQLite3PDO.php
rename to tests/cases/Db/SQLite3PDO/TestUpdate.php
index b75ba7d..9c8df84 100644
--- a/tests/cases/Db/SQLite3PDO/TestDbUpdateSQLite3PDO.php
+++ b/tests/cases/Db/SQLite3PDO/TestUpdate.php
@@ -4,14 +4,19 @@
  * See LICENSE and AUTHORS files for details */
 
 declare(strict_types=1);
-namespace JKingWeb\Arsse;
+namespace JKingWeb\Arsse\TestCase\Db\SQLite3PDO;
 
+use JKingWeb\Arsse\Arsse;
+use JKingWeb\Arsse\Conf;
+use JKingWeb\Arsse\Database;
+use JKingWeb\Arsse\Db\Exception;
+use JKingWeb\Arsse\Db\SQLite3\PDODriver;
 use org\bovigo\vfs\vfsStream;
 
 /**
  * @covers \JKingWeb\Arsse\Db\SQLite3\PDODriver<extended>
  * @covers \JKingWeb\Arsse\Db\PDOError */
-class TestDbUpdateSQLite3PDO extends Test\AbstractTest {
+class TestUpdate extends \JKingWeb\Arsse\Test\AbstractTest {
     protected $data;
     protected $drv;
     protected $vfs;
@@ -21,7 +26,7 @@ class TestDbUpdateSQLite3PDO extends Test\AbstractTest {
     const MINIMAL2 = "pragma user_version=2";
 
     public function setUp(Conf $conf = null) {
-        if (!Db\SQLite3\PDODriver::requirementsMet()) {
+        if (!PDODriver::requirementsMet()) {
             $this->markTestSkipped("PDO-SQLite extension not loaded");
         }
         $this->clearData();
@@ -29,12 +34,12 @@ class TestDbUpdateSQLite3PDO extends Test\AbstractTest {
         if (!$conf) {
             $conf = new Conf();
         }
-        $conf->dbDriver = Db\SQLite3\PDODriver::class;
+        $conf->dbDriver = PDODriver::class;
         $conf->dbSQLite3File = ":memory:";
         Arsse::$conf = $conf;
         $this->base = $this->vfs->url();
         $this->path = $this->base."/SQLite3/";
-        $this->drv = new Db\SQLite3\PDODriver();
+        $this->drv = new PDODriver();
     }
 
     public function tearDown() {
diff --git a/tests/lib/Database/DriverSQLite3.php b/tests/lib/Database/DriverSQLite3.php
index 04dc887..1b76eea 100644
--- a/tests/lib/Database/DriverSQLite3.php
+++ b/tests/lib/Database/DriverSQLite3.php
@@ -11,7 +11,7 @@ use JKingWeb\Arsse\Db\SQLite3\Driver;
 
 trait DriverSQLite3 {
     public function setUpDriver() {
-        if (!extension_loaded("sqlite3")) {
+        if (!Driver::requirementsMet()) {
             $this->markTestSkipped("SQLite extension not loaded");
         }
         Arsse::$conf->dbSQLite3File = ":memory:";
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 12cf9bc..9696d57 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -52,11 +52,11 @@
         <file>cases/Db/SQLite3/TestDriver.php</file>
         <file>cases/Db/SQLite3/TestUpdate.php</file>
 
-        <file>cases/Db/SQLite3PDO/TestDbResultSQLite3PDO.php</file>
-        <file>cases/Db/SQLite3PDO/TestDbStatementSQLite3PDO.php</file>
-        <file>cases/Db/SQLite3PDO/TestDbDriverCreationSQLite3PDO.php</file>
-        <file>cases/Db/SQLite3PDO/TestDbDriverSQLite3PDO.php</file>
-        <file>cases/Db/SQLite3PDO/TestDbUpdateSQLite3PDO.php</file>
+        <file>cases/Db/SQLite3PDO/TestResult.php</file>
+        <file>cases/Db/SQLite3PDO/TestStatement.php</file>
+        <file>cases/Db/SQLite3PDO/TestCreation.php</file>
+        <file>cases/Db/SQLite3PDO/TestDriver.php</file>
+        <file>cases/Db/SQLite3PDO/TestUpdate.php</file>
     </testsuite>
     <testsuite name="Database functions">
         <file>cases/Db/SQLite3/Database/TestMiscellany.php</file>
@@ -70,15 +70,16 @@
         <file>cases/Db/SQLite3/Database/TestLabel.php</file>
         <file>cases/Db/SQLite3/Database/TestCleanup.php</file>
 
-        <file>cases/Db/SQLite3PDO/Database/TestDatabaseMiscellanySQLite3PDO.php</file>
-        <file>cases/Db/SQLite3PDO/Database/TestDatabaseUserSQLite3PDO.php</file>
-        <file>cases/Db/SQLite3PDO/Database/TestDatabaseSessionSQLite3PDO.php</file>
-        <file>cases/Db/SQLite3PDO/Database/TestDatabaseFolderSQLite3PDO.php</file>
-        <file>cases/Db/SQLite3PDO/Database/TestDatabaseFeedSQLite3PDO.php</file>
-        <file>cases/Db/SQLite3PDO/Database/TestDatabaseSubscriptionSQLite3PDO.php</file>
-        <file>cases/Db/SQLite3PDO/Database/TestDatabaseArticleSQLite3PDO.php</file>
-        <file>cases/Db/SQLite3PDO/Database/TestDatabaseLabelSQLite3PDO.php</file>
-        <file>cases/Db/SQLite3PDO/Database/TestDatabaseCleanupSQLite3PDO.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>
     </testsuite>
     <testsuite name="Controllers">
         <testsuite name="NCNv1">