diff --git a/entity_test.go b/entity_test.go
index b098673..aac0dda 100644
--- a/entity_test.go
+++ b/entity_test.go
@@ -2,7 +2,7 @@ package configkit_test
 
 import (
 	. "github.com/dogmatiq/configkit"
-	"github.com/dogmatiq/configkit/message" // can't dot-import due to conflicts
+	"github.com/dogmatiq/configkit/message"
 	. "github.com/dogmatiq/enginekit/enginetest/stubs"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
diff --git a/handler_test.go b/handler_test.go
index f4350ae..85a55f7 100644
--- a/handler_test.go
+++ b/handler_test.go
@@ -2,7 +2,7 @@ package configkit_test
 
 import (
 	. "github.com/dogmatiq/configkit"
-	"github.com/dogmatiq/dogma" // can't dot-import due to conflicts
+	"github.com/dogmatiq/dogma"
 	. "github.com/dogmatiq/enginekit/enginetest/stubs"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
diff --git a/handlerset_test.go b/handlerset_test.go
index 0676522..3ed3f83 100644
--- a/handlerset_test.go
+++ b/handlerset_test.go
@@ -7,7 +7,7 @@ import (
 	. "github.com/dogmatiq/configkit"
 	"github.com/dogmatiq/configkit/fixtures"
 	"github.com/dogmatiq/configkit/message"
-	"github.com/dogmatiq/dogma" // can't dot-import due to conflicts
+	"github.com/dogmatiq/dogma"
 	. "github.com/dogmatiq/enginekit/enginetest/stubs"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
diff --git a/integration_test.go b/integration_test.go
index 8ff65ba..15ab0e8 100644
--- a/integration_test.go
+++ b/integration_test.go
@@ -8,7 +8,7 @@ import (
 	. "github.com/dogmatiq/configkit"
 	"github.com/dogmatiq/configkit/fixtures" // can't dot-import due to conflicts
 	"github.com/dogmatiq/configkit/message"
-	"github.com/dogmatiq/dogma" // can't dot-import due to conflicts
+	"github.com/dogmatiq/dogma"
 	. "github.com/dogmatiq/enginekit/enginetest/stubs"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
diff --git a/message/typeset_test.go b/message/typeset_test.go
index 1bef271..cb02d3e 100644
--- a/message/typeset_test.go
+++ b/message/typeset_test.go
@@ -2,7 +2,6 @@ package message_test
 
 import (
 	. "github.com/dogmatiq/configkit/message"
-	"github.com/dogmatiq/dogma/fixtures"
 	. "github.com/dogmatiq/enginekit/enginetest/stubs"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
@@ -74,49 +73,49 @@ var _ = Describe("type TypeSet", func() {
 		})
 
 		It("returns the original set if a single set is given", func() {
-			a := TypesOf(fixtures.MessageA1, fixtures.MessageB1)
+			a := TypesOf(CommandA1, CommandB1)
 			Expect(UnionT(a)).To(Equal(a))
 		})
 
 		It("returns the original set for identical sets", func() {
-			a := TypesOf(fixtures.MessageA1, fixtures.MessageB1)
-			b := TypesOf(fixtures.MessageA1, fixtures.MessageB1)
-			c := TypesOf(fixtures.MessageA1, fixtures.MessageB1)
+			a := TypesOf(CommandA1, CommandB1)
+			b := TypesOf(CommandA1, CommandB1)
+			c := TypesOf(CommandA1, CommandB1)
 			Expect(UnionT(a, b, c)).To(Equal(a))
 		})
 
 		It("returns the union", func() {
-			a := TypesOf(fixtures.MessageA1, fixtures.MessageB1, fixtures.MessageC1)
-			b := TypesOf(fixtures.MessageB1, fixtures.MessageC1, fixtures.MessageD1)
-			c := TypesOf(fixtures.MessageC1, fixtures.MessageD1, fixtures.MessageE1)
+			a := TypesOf(CommandA1, CommandB1, CommandC1)
+			b := TypesOf(CommandB1, CommandC1, CommandD1)
+			c := TypesOf(CommandC1, CommandD1, CommandE1)
 
 			Expect(UnionT(a, b, c)).To(Equal(TypesOf(
-				fixtures.MessageA1,
-				fixtures.MessageB1,
-				fixtures.MessageC1,
-				fixtures.MessageD1,
-				fixtures.MessageE1,
+				CommandA1,
+				CommandB1,
+				CommandC1,
+				CommandD1,
+				CommandE1,
 			)))
 		})
 	})
 
 	Describe("func DiffT()", func() {
 		It("returns an empty set for identical sets", func() {
-			a := TypesOf(fixtures.MessageA1, fixtures.MessageB1)
-			b := TypesOf(fixtures.MessageA1, fixtures.MessageB1)
+			a := TypesOf(CommandA1, CommandB1)
+			b := TypesOf(CommandA1, CommandB1)
 			Expect(DiffT(a, b)).To(BeEmpty())
 		})
 
 		It("returns an the original set for disjoint sets", func() {
-			a := TypesOf(fixtures.MessageA1, fixtures.MessageB1)
-			b := TypesOf(fixtures.MessageC1, fixtures.MessageD1)
+			a := TypesOf(CommandA1, CommandB1)
+			b := TypesOf(CommandC1, CommandD1)
 			Expect(DiffT(a, b)).To(Equal(a))
 		})
 
 		It("returns the diff", func() {
-			a := TypesOf(fixtures.MessageA1, fixtures.MessageB1, fixtures.MessageC1)
-			b := TypesOf(fixtures.MessageB1, fixtures.MessageC1)
-			Expect(DiffT(a, b)).To(Equal(TypesOf(fixtures.MessageA1)))
+			a := TypesOf(CommandA1, CommandB1, CommandC1)
+			b := TypesOf(CommandB1, CommandC1)
+			Expect(DiffT(a, b)).To(Equal(TypesOf(CommandA1)))
 		})
 	})