diff --git a/tests/common.py b/tests/common.py
new file mode 100644
index 0000000..e250bb1
--- /dev/null
+++ b/tests/common.py
@@ -0,0 +1,12 @@
+import unittest
+
+import etiquette
+
+
+class EtiquetteTest(unittest.TestCase):
+    def setUp(self):
+        self.P = etiquette.photodb.PhotoDB(ephemeral=True)
+
+    def tearDown(self):
+        self.P.close()
+        del self.P
diff --git a/tests/run_tests.py b/tests/run_tests.py
new file mode 100644
index 0000000..0534c72
--- /dev/null
+++ b/tests/run_tests.py
@@ -0,0 +1,11 @@
+import unittest
+
+import common
+import test_albums
+import test_bookmarks
+import test_photos
+import test_search
+import test_tags
+import test_users
+
+unittest.main()
diff --git a/tests/test_albums.py b/tests/test_albums.py
new file mode 100644
index 0000000..0f02566
--- /dev/null
+++ b/tests/test_albums.py
@@ -0,0 +1,17 @@
+import common
+
+
+class AlbumTest(common.EtiquetteTest):
+    def setUp(self):
+        super().setUp()
+
+
+class AlbumSumsTest(AlbumTest):
+    def test_sum_photos(self):
+        pass
+
+    def test_sum_bytes_local(self):
+        pass
+
+    def test_sum_bytes_recursive(self):
+        pass
diff --git a/tests/test_bookmarks.py b/tests/test_bookmarks.py
new file mode 100644
index 0000000..1345182
--- /dev/null
+++ b/tests/test_bookmarks.py
@@ -0,0 +1,5 @@
+import common
+
+
+class BookmarkTest(common.EtiquetteTest):
+    pass
diff --git a/tests/test_etiquette.py b/tests/test_etiquette.py
deleted file mode 100644
index 02373ea..0000000
--- a/tests/test_etiquette.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import unittest
-import random
-
-class EtiquetteTest(unittest.TestCase):
-    def setUp(self):
-        self.P = phototagger.PhotoDB(':memory:')
-
-class AlbumTest(EtiquetteTest):
-    pass
-
-
-class BookmarkTest(EtiquetteTest):
-    pass
-
-
-class PhotoTest(EtiquetteTest):
-    pass
-
-
-class PhotoDBTest(EtiquetteTest):
-    pass
-
-
-class SearchTest(EtiquetteTest):
-    pass
-
-
-class TagTest(EtiquetteTest):
-    pass
-
-
-class UserTest(EtiquetteTest):
-    pass
-
-
diff --git a/tests/test_photos.py b/tests/test_photos.py
new file mode 100644
index 0000000..bfafb0d
--- /dev/null
+++ b/tests/test_photos.py
@@ -0,0 +1,5 @@
+import common
+
+
+class PhotoTest(common.EtiquetteTest):
+    pass
diff --git a/tests/test_search.py b/tests/test_search.py
new file mode 100644
index 0000000..097e2bf
--- /dev/null
+++ b/tests/test_search.py
@@ -0,0 +1,5 @@
+import common
+
+
+class SearchTest(common.EtiquetteTest):
+    pass
diff --git a/tests/test_tags.py b/tests/test_tags.py
new file mode 100644
index 0000000..3a64290
--- /dev/null
+++ b/tests/test_tags.py
@@ -0,0 +1,5 @@
+import common
+
+
+class TagTest(common.EtiquetteTest):
+    pass
diff --git a/tests/test_users.py b/tests/test_users.py
new file mode 100644
index 0000000..c8772de
--- /dev/null
+++ b/tests/test_users.py
@@ -0,0 +1,5 @@
+import common
+
+
+class UserTest(common.EtiquetteTest):
+    pass