diff --git a/core/models/users.go b/core/models/users.go
index 2b89a12ac..618a33747 100644
--- a/core/models/users.go
+++ b/core/models/users.go
@@ -29,9 +29,7 @@ type UserRole string
 const (
 	UserRoleAdministrator UserRole = "A"
 	UserRoleEditor        UserRole = "E"
-	UserRoleViewer        UserRole = "V"
 	UserRoleAgent         UserRole = "T"
-	UserRoleSurveyor      UserRole = "S"
 )
 
 // User is our type for a user asset
diff --git a/core/models/users_test.go b/core/models/users_test.go
index b09b0b5f4..770ff86c3 100644
--- a/core/models/users_test.go
+++ b/core/models/users_test.go
@@ -31,7 +31,6 @@ func TestLoadUsers(t *testing.T) {
 		{id: testdata.Admin.ID, email: testdata.Admin.Email, name: "Andy Admin", role: models.UserRoleAdministrator, team: nil},
 		{id: testdata.Agent.ID, email: testdata.Agent.Email, name: "Ann D'Agent", role: models.UserRoleAgent, team: partners},
 		{id: testdata.Editor.ID, email: testdata.Editor.Email, name: "Ed McEditor", role: models.UserRoleEditor, team: nil},
-		{id: testdata.Viewer.ID, email: testdata.Viewer.Email, name: "Veronica Views", role: models.UserRoleViewer, team: nil},
 	}
 
 	require.Equal(t, len(expectedUsers), len(users))
diff --git a/testsuite/testdata/constants.go b/testsuite/testdata/constants.go
index 0041a85f8..bf7674a27 100644
--- a/testsuite/testdata/constants.go
+++ b/testsuite/testdata/constants.go
@@ -19,8 +19,7 @@ var AuthGroupIDs = map[string]int{
 var Org1 = &Org{1, "bf0514a5-9407-44c9-b0f9-3f36f9c18414"}
 var Admin = &User{3, "admin1@textit.com"}
 var Editor = &User{4, "editor1@textit.com"}
-var Viewer = &User{5, "viewer1@textit.com"}
-var Agent = &User{6, "agent1@textit.com"}
+var Agent = &User{5, "agent1@textit.com"}
 
 var TwilioChannel = &Channel{10000, "74729f45-7f29-4868-9dc4-90e491e3c7d8", "T"}
 var VonageChannel = &Channel{10001, "19012bfd-3ce3-4cae-9bb9-76cf92c73d49", "NX"}
diff --git a/testsuite/testfiles/postgres.dump b/testsuite/testfiles/postgres.dump
index b9ef57879..24f54f373 100644
Binary files a/testsuite/testfiles/postgres.dump and b/testsuite/testfiles/postgres.dump differ
diff --git a/web/msg/testdata/send.json b/web/msg/testdata/send.json
index f48e89f35..27f311606 100644
--- a/web/msg/testdata/send.json
+++ b/web/msg/testdata/send.json
@@ -114,7 +114,7 @@
         "path": "/mr/msg/send",
         "body": {
             "org_id": 1,
-            "user_id": 6,
+            "user_id": 5,
             "contact_id": 10000,
             "text": "we can help",
             "ticket_id": $cathy_ticket_id$
diff --git a/web/ticket/testdata/assign.json b/web/ticket/testdata/assign.json
index 32bd9624e..ac9a4723f 100644
--- a/web/ticket/testdata/assign.json
+++ b/web/ticket/testdata/assign.json
@@ -11,7 +11,7 @@
                 2,
                 3
             ],
-            "assignee_id": 6
+            "assignee_id": 5
         },
         "status": 200,
         "response": {
@@ -22,7 +22,7 @@
         },
         "db_assertions": [
             {
-                "query": "SELECT count(*) FROM tickets_ticket WHERE assignee_id = 6",
+                "query": "SELECT count(*) FROM tickets_ticket WHERE assignee_id = 5",
                 "count": 3
             },
             {