diff --git a/events/dbpersist/dbpersist_test.go b/events/dbpersist/dbpersist_test.go
index 25e7474f..5c21ea64 100644
--- a/events/dbpersist/dbpersist_test.go
+++ b/events/dbpersist/dbpersist_test.go
@@ -14,8 +14,8 @@ import (
 	"github.com/bluesky-social/indigo/events"
 	lexutil "github.com/bluesky-social/indigo/lex/util"
 	"github.com/bluesky-social/indigo/models"
-	pds "github.com/bluesky-social/indigo/pds/data"
 	"github.com/bluesky-social/indigo/repomgr"
+	pds "github.com/bluesky-social/indigo/testing/pdsmodels"
 	"github.com/bluesky-social/indigo/util"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
diff --git a/events/diskpersist/diskpersist_test.go b/events/diskpersist/diskpersist_test.go
index 30bae635..bc1ef8bf 100644
--- a/events/diskpersist/diskpersist_test.go
+++ b/events/diskpersist/diskpersist_test.go
@@ -17,8 +17,8 @@ import (
 	"github.com/bluesky-social/indigo/events"
 	lexutil "github.com/bluesky-social/indigo/lex/util"
 	"github.com/bluesky-social/indigo/models"
-	pds "github.com/bluesky-social/indigo/pds/data"
 	"github.com/bluesky-social/indigo/repomgr"
+	pds "github.com/bluesky-social/indigo/testing/pdsmodels"
 	"github.com/bluesky-social/indigo/util"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
diff --git a/events/pebblepersist/pebblepersist_test.go b/events/pebblepersist/pebblepersist_test.go
index 8735112f..47c4bb9f 100644
--- a/events/pebblepersist/pebblepersist_test.go
+++ b/events/pebblepersist/pebblepersist_test.go
@@ -14,8 +14,8 @@ import (
 	"github.com/bluesky-social/indigo/events/diskpersist"
 	lexutil "github.com/bluesky-social/indigo/lex/util"
 	"github.com/bluesky-social/indigo/models"
-	pds "github.com/bluesky-social/indigo/pds/data"
 	"github.com/bluesky-social/indigo/repomgr"
+	pds "github.com/bluesky-social/indigo/testing/pdsmodels"
 	"github.com/bluesky-social/indigo/util"
 
 	"gorm.io/driver/sqlite"
diff --git a/testing/pdsmodels/types.go b/testing/pdsmodels/types.go
new file mode 100644
index 00000000..316adf80
--- /dev/null
+++ b/testing/pdsmodels/types.go
@@ -0,0 +1,32 @@
+package pdsmodels
+
+// This file contains legacy PDS-related database model types. They are used in
+// some event persister tests.
+
+import (
+	"time"
+
+	"github.com/bluesky-social/indigo/models"
+
+	"gorm.io/gorm"
+)
+
+type User struct {
+	ID          models.Uid `gorm:"primarykey"`
+	CreatedAt   time.Time
+	UpdatedAt   time.Time
+	DeletedAt   gorm.DeletedAt `gorm:"index"`
+	Handle      string         `gorm:"uniqueIndex"`
+	Password    string
+	RecoveryKey string
+	Email       string
+	Did         string `gorm:"uniqueIndex"`
+	PDS         uint
+}
+
+type Peering struct {
+	gorm.Model
+	Host     string
+	Did      string
+	Approved bool
+}