diff --git a/rest/testmocks_test.go b/datastore/testing.go
similarity index 75%
rename from rest/testmocks_test.go
rename to datastore/testing.go
index 0092714..5b891d8 100644
--- a/rest/testmocks_test.go
+++ b/datastore/testing.go
@@ -1,4 +1,4 @@
-package rest
+package datastore
 
 import (
 	"io"
@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/jhillyerd/enmime"
-	"github.com/jhillyerd/inbucket/datastore"
 	"github.com/stretchr/testify/mock"
 )
 
@@ -15,14 +14,14 @@ type MockDataStore struct {
 	mock.Mock
 }
 
-func (m *MockDataStore) MailboxFor(name string) (datastore.Mailbox, error) {
+func (m *MockDataStore) MailboxFor(name string) (Mailbox, error) {
 	args := m.Called(name)
-	return args.Get(0).(datastore.Mailbox), args.Error(1)
+	return args.Get(0).(Mailbox), args.Error(1)
 }
 
-func (m *MockDataStore) AllMailboxes() ([]datastore.Mailbox, error) {
+func (m *MockDataStore) AllMailboxes() ([]Mailbox, error) {
 	args := m.Called()
-	return args.Get(0).([]datastore.Mailbox), args.Error(1)
+	return args.Get(0).([]Mailbox), args.Error(1)
 }
 
 // Mock Mailbox object
@@ -30,14 +29,14 @@ type MockMailbox struct {
 	mock.Mock
 }
 
-func (m *MockMailbox) GetMessages() ([]datastore.Message, error) {
+func (m *MockMailbox) GetMessages() ([]Message, error) {
 	args := m.Called()
-	return args.Get(0).([]datastore.Message), args.Error(1)
+	return args.Get(0).([]Message), args.Error(1)
 }
 
-func (m *MockMailbox) GetMessage(id string) (datastore.Message, error) {
+func (m *MockMailbox) GetMessage(id string) (Message, error) {
 	args := m.Called(id)
-	return args.Get(0).(datastore.Message), args.Error(1)
+	return args.Get(0).(Message), args.Error(1)
 }
 
 func (m *MockMailbox) Purge() error {
@@ -45,9 +44,9 @@ func (m *MockMailbox) Purge() error {
 	return args.Error(0)
 }
 
-func (m *MockMailbox) NewMessage() (datastore.Message, error) {
+func (m *MockMailbox) NewMessage() (Message, error) {
 	args := m.Called()
-	return args.Get(0).(datastore.Message), args.Error(1)
+	return args.Get(0).(Message), args.Error(1)
 }
 
 func (m *MockMailbox) Name() string {
diff --git a/rest/apiv1_controller_test.go b/rest/apiv1_controller_test.go
index a7aa445..b1c9a00 100644
--- a/rest/apiv1_controller_test.go
+++ b/rest/apiv1_controller_test.go
@@ -31,7 +31,7 @@ const (
 
 func TestRestMailboxList(t *testing.T) {
 	// Setup
-	ds := &MockDataStore{}
+	ds := &datastore.MockDataStore{}
 	logbuf := setupWebServer(ds)
 
 	// Test invalid mailbox name
@@ -45,7 +45,7 @@ func TestRestMailboxList(t *testing.T) {
 	}
 
 	// Test empty mailbox
-	emptybox := &MockMailbox{}
+	emptybox := &datastore.MockMailbox{}
 	ds.On("MailboxFor", "empty").Return(emptybox, nil)
 	emptybox.On("GetMessages").Return([]datastore.Message{}, nil)
 
@@ -59,7 +59,7 @@ func TestRestMailboxList(t *testing.T) {
 	}
 
 	// Test MailboxFor error
-	ds.On("MailboxFor", "error").Return(&MockMailbox{}, fmt.Errorf("Internal error"))
+	ds.On("MailboxFor", "error").Return(&datastore.MockMailbox{}, fmt.Errorf("Internal error"))
 	w, err = testRestGet(baseURL + "/mailbox/error")
 	expectCode = 500
 	if err != nil {
@@ -77,7 +77,7 @@ func TestRestMailboxList(t *testing.T) {
 	}
 
 	// Test MailboxFor error
-	error2box := &MockMailbox{}
+	error2box := &datastore.MockMailbox{}
 	ds.On("MailboxFor", "error2").Return(error2box, nil)
 	error2box.On("GetMessages").Return([]datastore.Message{}, fmt.Errorf("Internal error 2"))
 
@@ -107,7 +107,7 @@ func TestRestMailboxList(t *testing.T) {
 		Subject: "subject 2",
 		Date:    time.Date(2012, 7, 1, 10, 11, 12, 253, time.FixedZone("PDT", -700)),
 	}
-	goodbox := &MockMailbox{}
+	goodbox := &datastore.MockMailbox{}
 	ds.On("MailboxFor", "good").Return(goodbox, nil)
 	msg1 := data1.MockMessage()
 	msg2 := data2.MockMessage()
@@ -155,7 +155,7 @@ func TestRestMailboxList(t *testing.T) {
 
 func TestRestMessage(t *testing.T) {
 	// Setup
-	ds := &MockDataStore{}
+	ds := &datastore.MockDataStore{}
 	logbuf := setupWebServer(ds)
 
 	// Test invalid mailbox name
@@ -169,9 +169,9 @@ func TestRestMessage(t *testing.T) {
 	}
 
 	// Test requesting a message that does not exist
-	emptybox := &MockMailbox{}
+	emptybox := &datastore.MockMailbox{}
 	ds.On("MailboxFor", "empty").Return(emptybox, nil)
-	emptybox.On("GetMessage", "0001").Return(&MockMessage{}, datastore.ErrNotExist)
+	emptybox.On("GetMessage", "0001").Return(&datastore.MockMessage{}, datastore.ErrNotExist)
 
 	w, err = testRestGet(baseURL + "/mailbox/empty/0001")
 	expectCode = 404
@@ -183,7 +183,7 @@ func TestRestMessage(t *testing.T) {
 	}
 
 	// Test MailboxFor error
-	ds.On("MailboxFor", "error").Return(&MockMailbox{}, fmt.Errorf("Internal error"))
+	ds.On("MailboxFor", "error").Return(&datastore.MockMailbox{}, fmt.Errorf("Internal error"))
 	w, err = testRestGet(baseURL + "/mailbox/error/0001")
 	expectCode = 500
 	if err != nil {
@@ -201,9 +201,9 @@ func TestRestMessage(t *testing.T) {
 	}
 
 	// Test GetMessage error
-	error2box := &MockMailbox{}
+	error2box := &datastore.MockMailbox{}
 	ds.On("MailboxFor", "error2").Return(error2box, nil)
-	error2box.On("GetMessage", "0001").Return(&MockMessage{}, fmt.Errorf("Internal error 2"))
+	error2box.On("GetMessage", "0001").Return(&datastore.MockMessage{}, fmt.Errorf("Internal error 2"))
 
 	w, err = testRestGet(baseURL + "/mailbox/error2/0001")
 	expectCode = 500
@@ -228,7 +228,7 @@ func TestRestMessage(t *testing.T) {
 		Text: "This is some text",
 		HTML: "This is some HTML",
 	}
-	goodbox := &MockMailbox{}
+	goodbox := &datastore.MockMailbox{}
 	ds.On("MailboxFor", "good").Return(goodbox, nil)
 	msg1 := data1.MockMessage()
 	goodbox.On("GetMessage", "0001").Return(msg1, nil)
diff --git a/rest/testutils_test.go b/rest/testutils_test.go
index d0e37d7..6ef4182 100644
--- a/rest/testutils_test.go
+++ b/rest/testutils_test.go
@@ -25,8 +25,8 @@ type InputMessageData struct {
 	HTML, Text                 string
 }
 
-func (d *InputMessageData) MockMessage() *MockMessage {
-	msg := &MockMessage{}
+func (d *InputMessageData) MockMessage() *datastore.MockMessage {
+	msg := &datastore.MockMessage{}
 	msg.On("ID").Return(d.ID)
 	msg.On("From").Return(d.From)
 	msg.On("To").Return(d.To)