diff --git a/test/.eslintrc b/test/.eslintrc
index 922c66c49fef70084d303d7d3a8a6178eb018f4f..302bdda9dd7f6990ba1bb37893e87f6dc552f7b9 100644
--- a/test/.eslintrc
+++ b/test/.eslintrc
@@ -6,5 +6,8 @@
   "globals": {
     "fixture": true,
     "test": true
+  },
+  "rules": {
+    "no-param-reassign": ["error", { "props": false }]
   }
 }
diff --git a/test/helpers/authenticate-fixture.js b/test/helpers/authenticate-fixture.js
new file mode 100644
index 0000000000000000000000000000000000000000..384143ddf2406cac5c60cebe4c7b0447edb8a566
--- /dev/null
+++ b/test/helpers/authenticate-fixture.js
@@ -0,0 +1,25 @@
+import { ClientFunction } from 'testcafe'
+import { addUser } from '@pubsweet/db-manager'
+import authentication from 'pubsweet-server/src/authentication'
+import { startServer, setup, teardown } from './setup'
+
+const admin = {
+  username: 'tester',
+  email: 'tester@example.com',
+  password: 'password',
+  orcid: '0000-0001',
+  admin: true,
+}
+
+export default chosenFixture =>
+  chosenFixture
+    .before(startServer)
+    .beforeEach(async t => {
+      await setup()
+      const user = await addUser(admin)
+      t.ctx.token = authentication.token.create(user)
+      t.ctx.localStorageSet = ClientFunction(token =>
+        localStorage.setItem('token', token),
+      )
+    })
+    .afterEach(teardown)
diff --git a/test/submission.e2e.js b/test/submission.e2e.js
index e27bcc74e75077fc5f75bc23f102a374eef423b4..287593b44063a9d9bcce50d9e729680231b1c228 100644
--- a/test/submission.e2e.js
+++ b/test/submission.e2e.js
@@ -1,38 +1,17 @@
 import replay from 'replay'
-import { Selector, ClientFunction } from 'testcafe'
-import { addUser } from '@pubsweet/db-manager'
-import authentication from 'pubsweet-server/src/authentication'
-import { startServer, setup, teardown } from './helpers/setup'
+import { Selector } from 'testcafe'
 import { dashboard } from './pageObjects'
+import authenticateFixture from './helpers/authenticate-fixture'
 
 replay.fixtures = `${__dirname}/http-mocks`
 
-const admin = {
-  username: 'tester',
-  email: 'tester@example.com',
-  password: 'password',
-  orcid: '0000-0001',
-  admin: true,
-}
-let token
-
-fixture('Submission')
-  .before(startServer)
-  .beforeEach(async () => {
-    await setup()
-    const user = await addUser(admin)
-    token = authentication.token.create(user)
-  })
-  .afterEach(teardown)
-
-const localStorageSet = ClientFunction((key, val) =>
-  localStorage.setItem(key, val),
-)
+const f = fixture('Submission')
+authenticateFixture(f)
 
 test('Happy path', async t => {
   // fake login by navigating to site and injecting token into local storage
   await t.navigateTo(dashboard.url)
-  await localStorageSet('token', token)
+  await t.ctx.localStorageSet(t.ctx.token)
 
   await t.navigateTo(dashboard.url).click('[data-test-id=submit]')