diff --git a/internal/manager/task_state_machine/interfaces.go b/internal/manager/task_state_machine/interfaces.go
new file mode 100644
index 00000000..5a496f60
--- /dev/null
+++ b/internal/manager/task_state_machine/interfaces.go
@@ -0,0 +1,47 @@
+package task_state_machine
+
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+import (
+	"context"
+
+	"git.blender.org/flamenco/internal/manager/persistence"
+	"git.blender.org/flamenco/internal/manager/webupdates"
+	"git.blender.org/flamenco/pkg/api"
+)
+
+// Generate mock implementations of these interfaces.
+//go:generate go run github.com/golang/mock/mockgen -destination mocks/interfaces_mock.gen.go -package mocks git.blender.org/flamenco/internal/manager/task_state_machine PersistenceService,ChangeBroadcaster
+
+type PersistenceService interface {
+	SaveTask(ctx context.Context, task *persistence.Task) error
+	SaveJobStatus(ctx context.Context, j *persistence.Job) error
+
+	JobHasTasksInStatus(ctx context.Context, job *persistence.Job, taskStatus api.TaskStatus) (bool, error)
+	CountTasksOfJobInStatus(ctx context.Context, job *persistence.Job, taskStatuses ...api.TaskStatus) (numInStatus, numTotal int, err error)
+
+	// UpdateJobsTaskStatuses updates the status & activity of the tasks of `job`.
+	UpdateJobsTaskStatuses(ctx context.Context, job *persistence.Job,
+		taskStatus api.TaskStatus, activity string) error
+
+	// UpdateJobsTaskStatusesConditional updates the status & activity of the tasks of `job`,
+	// limited to those tasks with status in `statusesToUpdate`.
+	UpdateJobsTaskStatusesConditional(ctx context.Context, job *persistence.Job,
+		statusesToUpdate []api.TaskStatus, taskStatus api.TaskStatus, activity string) error
+
+	FetchJobsInStatus(ctx context.Context, jobStatuses ...api.JobStatus) ([]*persistence.Job, error)
+}
+
+// PersistenceService should be a subset of persistence.DB
+var _ PersistenceService = (*persistence.DB)(nil)
+
+type ChangeBroadcaster interface {
+	// BroadcastJobUpdate sends the job update to SocketIO clients.
+	BroadcastJobUpdate(jobUpdate api.SocketIOJobUpdate)
+
+	// BroadcastTaskUpdate sends the task update to SocketIO clients.
+	BroadcastTaskUpdate(jobUpdate api.SocketIOTaskUpdate)
+}
+
+// ChangeBroadcaster should be a subset of webupdates.BiDirComms
+var _ ChangeBroadcaster = (*webupdates.BiDirComms)(nil)
diff --git a/internal/manager/task_state_machine/task_state_machine.go b/internal/manager/task_state_machine/task_state_machine.go
index be00e6dd..fd250437 100644
--- a/internal/manager/task_state_machine/task_state_machine.go
+++ b/internal/manager/task_state_machine/task_state_machine.go
@@ -24,41 +24,6 @@ type StateMachine struct {
 	broadcaster ChangeBroadcaster
 }
 
-// Generate mock implementations of these interfaces.
-//go:generate go run github.com/golang/mock/mockgen -destination mocks/interfaces_mock.gen.go -package mocks git.blender.org/flamenco/internal/manager/task_state_machine PersistenceService,ChangeBroadcaster
-
-type PersistenceService interface {
-	SaveTask(ctx context.Context, task *persistence.Task) error
-	SaveJobStatus(ctx context.Context, j *persistence.Job) error
-
-	JobHasTasksInStatus(ctx context.Context, job *persistence.Job, taskStatus api.TaskStatus) (bool, error)
-	CountTasksOfJobInStatus(ctx context.Context, job *persistence.Job, taskStatuses ...api.TaskStatus) (numInStatus, numTotal int, err error)
-
-	// UpdateJobsTaskStatuses updates the status & activity of the tasks of `job`.
-	UpdateJobsTaskStatuses(ctx context.Context, job *persistence.Job,
-		taskStatus api.TaskStatus, activity string) error
-
-	// UpdateJobsTaskStatusesConditional updates the status & activity of the tasks of `job`,
-	// limited to those tasks with status in `statusesToUpdate`.
-	UpdateJobsTaskStatusesConditional(ctx context.Context, job *persistence.Job,
-		statusesToUpdate []api.TaskStatus, taskStatus api.TaskStatus, activity string) error
-
-	FetchJobsInStatus(ctx context.Context, jobStatuses ...api.JobStatus) ([]*persistence.Job, error)
-}
-
-// PersistenceService should be a subset of persistence.DB
-var _ PersistenceService = (*persistence.DB)(nil)
-
-type ChangeBroadcaster interface {
-	// BroadcastJobUpdate sends the job update to SocketIO clients.
-	BroadcastJobUpdate(jobUpdate api.SocketIOJobUpdate)
-
-	// BroadcastTaskUpdate sends the task update to SocketIO clients.
-	BroadcastTaskUpdate(jobUpdate api.SocketIOTaskUpdate)
-}
-
-// ChangeBroadcaster should be a subset of webupdates.BiDirComms
-var _ ChangeBroadcaster = (*webupdates.BiDirComms)(nil)
 
 func NewStateMachine(persist PersistenceService, broadcaster ChangeBroadcaster) *StateMachine {
 	return &StateMachine{