diff --git a/cmd/chisel/cmd_cut_test.go b/cmd/chisel/cmd_cut_test.go
index bdd5b633..88e8992a 100644
--- a/cmd/chisel/cmd_cut_test.go
+++ b/cmd/chisel/cmd_cut_test.go
@@ -9,6 +9,7 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/klauspost/compress/zstd"
 	. "gopkg.in/check.v1"
 
 	chisel "github.com/canonical/chisel/cmd/chisel"
@@ -536,3 +537,24 @@ func fakeOpenArchive(f func(opts *archive.Options) (archive.Archive, error)) (re
 	chisel.OpenArchive = f
 	return func() { chisel.OpenArchive = old }
 }
+
+// Extract a zstd-compressed file "src" at path "dest"
+func extractZSTD(path string) (string, error) {
+	file, err := os.Open(path)
+	if err != nil {
+		return "", err
+	}
+	defer file.Close()
+
+	reader, err := zstd.NewReader(file)
+	if err != nil {
+		return "", err
+	}
+	defer reader.Close()
+
+	bytes, err := io.ReadAll(reader)
+	if err != nil {
+		return "", err
+	}
+	return string(bytes), nil
+}
diff --git a/cmd/chisel/db_test.go b/cmd/chisel/db_test.go
deleted file mode 100644
index 0934a85f..00000000
--- a/cmd/chisel/db_test.go
+++ /dev/null
@@ -1,195 +0,0 @@
-package main_test
-
-import (
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/klauspost/compress/zstd"
-	. "gopkg.in/check.v1"
-
-	chisel "github.com/canonical/chisel/cmd/chisel"
-	"github.com/canonical/chisel/internal/jsonwall"
-)
-
-type writeDBTest struct {
-	summary    string
-	packages   []*chisel.DBPackage
-	slices     []*chisel.DBSlice
-	paths      []*chisel.DBPath
-	contents   []*chisel.DBContent
-	expectedDB string
-	err        string
-}
-
-var writeDBTests = []writeDBTest{{
-	summary: "Write Chisel DB",
-	packages: []*chisel.DBPackage{{
-		Kind:    "package",
-		Name:    "mypkg",
-		Version: "12ubuntu4.6",
-		Digest:  "522d1a2a9a41a86428d20e1a1b619946245ad5a62a348890f1630a6316b69f68",
-		Arch:    "amd64",
-	}, {
-		Kind:    "package",
-		Name:    "foo",
-		Version: "1ubuntu2.9",
-		Digest:  "b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c",
-		Arch:    "amd64",
-	}},
-	slices: []*chisel.DBSlice{{
-		Kind: "slice",
-		Name: "mypkg_myslice",
-	}, {
-		Kind: "slice",
-		Name: "mypkg_otherslice",
-	}, {
-		Kind: "slice",
-		Name: "foo_bar",
-	}},
-	paths: []*chisel.DBPath{{
-		Kind:   "path",
-		Path:   "/usr/bin/foo",
-		Mode:   "0644",
-		Slices: []string{"foo_bar"},
-		Hash:   "ebd0b5aaefd98c0f3a56f03d11cb27f858f257eb1206cb8f6264dc72aa8a2947",
-		Size:   1234,
-	}, {
-		Kind:   "path",
-		Path:   "/bin/foo",
-		Mode:   "0644",
-		Slices: []string{"foo_bar"},
-		Link:   "/usr/bin/foo",
-	}, {
-		Kind:   "path",
-		Path:   "/usr/bin/mypkg",
-		Mode:   "0775",
-		Slices: []string{"mypkg_myslice"},
-		Hash:   "c4ce8495a690e25636f83c00b5ee9128f78dcfea24523d2697dbd37114bb967a",
-		Size:   49357,
-	}, {
-		Kind:   "path",
-		Path:   "/bin/",
-		Mode:   "0775",
-		Slices: []string{"mypkg_myslice", "foo_bar"},
-	}, {
-		Kind:      "path",
-		Path:      "/etc/mypkg.conf",
-		Mode:      "0775",
-		Slices:    []string{"mypkg_otherslice"},
-		Hash:      "c4a49783f9f135204582d2a95f2551c77d8200798fe2c36e774943243985553c",
-		FinalHash: "71f28b05f5b0a3af1776ae55d578c16a11f10aef7dd408421c35dac17ca7cbad",
-		Size:      489,
-	}},
-	contents: []*chisel.DBContent{{
-		Kind:  "content",
-		Slice: "foo_bar",
-		Path:  "/usr/bin/foo",
-	}, {
-		Kind:  "content",
-		Slice: "foo_bar",
-		Path:  "/bin/foo",
-	}, {
-		Kind:  "content",
-		Slice: "foo_bar",
-		Path:  "/bin/",
-	}, {
-		Kind:  "content",
-		Slice: "mypkg_myslice",
-		Path:  "/usr/bin/mypkg",
-	}, {
-		Kind:  "content",
-		Slice: "mypkg_myslice",
-		Path:  "/bin/",
-	}, {
-		Kind:  "content",
-		Slice: "mypkg_otherslice",
-		Path:  "/etc/mypkg.conf",
-	}},
-	expectedDB: strings.TrimLeft(`
-{"jsonwall":"1.0","schema":"1.0","count":17}
-{"kind":"content","slice":"foo_bar","path":"/bin/"}
-{"kind":"content","slice":"foo_bar","path":"/bin/foo"}
-{"kind":"content","slice":"foo_bar","path":"/usr/bin/foo"}
-{"kind":"content","slice":"mypkg_myslice","path":"/bin/"}
-{"kind":"content","slice":"mypkg_myslice","path":"/usr/bin/mypkg"}
-{"kind":"content","slice":"mypkg_otherslice","path":"/etc/mypkg.conf"}
-{"kind":"package","name":"foo","version":"1ubuntu2.9","sha256":"b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c","arch":"amd64"}
-{"kind":"package","name":"mypkg","version":"12ubuntu4.6","sha256":"522d1a2a9a41a86428d20e1a1b619946245ad5a62a348890f1630a6316b69f68","arch":"amd64"}
-{"kind":"path","path":"/bin/","mode":"0775","slices":["mypkg_myslice","foo_bar"]}
-{"kind":"path","path":"/bin/foo","mode":"0644","slices":["foo_bar"],"link":"/usr/bin/foo"}
-{"kind":"path","path":"/etc/mypkg.conf","mode":"0775","slices":["mypkg_otherslice"],"sha256":"c4a49783f9f135204582d2a95f2551c77d8200798fe2c36e774943243985553c","final_sha256":"71f28b05f5b0a3af1776ae55d578c16a11f10aef7dd408421c35dac17ca7cbad","size":489}
-{"kind":"path","path":"/usr/bin/foo","mode":"0644","slices":["foo_bar"],"sha256":"ebd0b5aaefd98c0f3a56f03d11cb27f858f257eb1206cb8f6264dc72aa8a2947","size":1234}
-{"kind":"path","path":"/usr/bin/mypkg","mode":"0775","slices":["mypkg_myslice"],"sha256":"c4ce8495a690e25636f83c00b5ee9128f78dcfea24523d2697dbd37114bb967a","size":49357}
-{"kind":"slice","name":"foo_bar"}
-{"kind":"slice","name":"mypkg_myslice"}
-{"kind":"slice","name":"mypkg_otherslice"}
-`, "\n"),
-}}
-
-func (s *ChiselSuite) TestWriteDB(c *C) {
-	for _, test := range writeDBTests {
-		c.Logf("Summary: %s", test.summary)
-
-		dbw := jsonwall.NewDBWriter(&jsonwall.DBWriterOptions{
-			Schema: "1.0",
-		})
-
-		var err error
-		for _, pkg := range test.packages {
-			err = dbw.Add(pkg)
-		}
-		for _, slice := range test.slices {
-			err = dbw.Add(slice)
-		}
-		for _, path := range test.paths {
-			err = dbw.Add(path)
-		}
-		for _, content := range test.contents {
-			err = dbw.Add(content)
-		}
-		c.Assert(err, IsNil)
-
-		// Write DB at 2 separate locations.
-		dbPaths := []string{}
-		for i := 0; i < 2; i++ {
-			dir := c.MkDir()
-			dbPaths = append(dbPaths, filepath.Join(dir, "chisel.db"))
-		}
-
-		err = chisel.WriteDB(dbw, dbPaths)
-		if test.err != "" {
-			c.Assert(err, ErrorMatches, test.err)
-		} else {
-			c.Assert(err, IsNil)
-		}
-
-		for _, path := range dbPaths {
-			contents, err := extractZSTD(path)
-			c.Assert(err, IsNil)
-			c.Assert(contents, Equals, test.expectedDB)
-		}
-	}
-}
-
-// Extract a zstd-compressed file "src" at path "dest"
-func extractZSTD(path string) (string, error) {
-	file, err := os.Open(path)
-	if err != nil {
-		return "", err
-	}
-	defer file.Close()
-
-	reader, err := zstd.NewReader(file)
-	if err != nil {
-		return "", err
-	}
-	defer reader.Close()
-
-	bytes, err := io.ReadAll(reader)
-	if err != nil {
-		return "", err
-	}
-	return string(bytes), nil
-}
diff --git a/cmd/chisel/export_test.go b/cmd/chisel/export_test.go
index a328f375..cd3eec6f 100644
--- a/cmd/chisel/export_test.go
+++ b/cmd/chisel/export_test.go
@@ -1,14 +1,5 @@
 package main
 
-var (
-	WriteDB = writeDB
-)
-
-type DBPackage dbPackage
-type DBSlice dbSlice
-type DBPath dbPath
-type DBContent dbContent
-
 func FakeIsStdoutTTY(t bool) (restore func()) {
 	oldIsStdoutTTY := isStdoutTTY
 	isStdoutTTY = t