diff --git a/playwright/support/fixtures/random-user.ts b/playwright/support/fixtures/random-user.ts
index 973d600fb..e140a1f10 100644
--- a/playwright/support/fixtures/random-user.ts
+++ b/playwright/support/fixtures/random-user.ts
@@ -4,7 +4,7 @@
  */
 
 import { test as base } from '@playwright/test'
-import { createRandomUser, login } from '../utils/session'
+import { createRandomUser, login } from '@nextcloud/e2e-test-server/playwright'
 
 /**
  * This test fixture ensures a new random user is created and used for the test (current page)
@@ -17,8 +17,8 @@ export const test = base.extend({
 			baseURL,
 		})
 
-		const uid = await createRandomUser()
-		await login(page.request, uid, uid)
+		const user = await createRandomUser()
+		await login(page.request, user)
 
 		await use(page)
 		await page.close()
diff --git a/playwright/support/utils/session.ts b/playwright/support/utils/session.ts
deleted file mode 100644
index 22fc6f142..000000000
--- a/playwright/support/utils/session.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2024 Ferdinand Thiessen <opensource@fthiessen.de>
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-import { runExec, addUser } from '@nextcloud/e2e-test-server/docker'
-import { expect, type APIRequestContext } from '@playwright/test'
-
-/**
- * Restore database and data folder for tests
- */
-export function restoreDatabase() {
-	runExec('rm -rf data && tar -xf backup.tar')
-}
-
-/**
- * Helper to login on the Nextcloud instance
- * @param request API request object
- * @param user The username to login
- * @param password The password to login
- */
-export async function login(
-	request: APIRequestContext,
-	user: string,
-	password: string,
-) {
-	const tokenResponse = await request.get('./csrftoken')
-	expect(tokenResponse.status()).toBe(200)
-	const requesttoken = (await tokenResponse.json()).token
-
-	const loginResponse = await request.post('./login', {
-		form: {
-			user,
-			password,
-			requesttoken,
-		},
-		headers: {
-			Origin: tokenResponse.url().replace(/index.php.*/, ''),
-		},
-	})
-	expect(loginResponse.status()).toBe(200)
-
-	const response = await request.get('apps/files')
-	expect(response.status()).toBe(200)
-}
-
-/**
- * Create a new random user (password is set to the UID)
- * @return The UID of the new user
- */
-export async function createRandomUser(): Promise<string> {
-	const uid = (Math.random() + 1).toString(36).substring(7)
-	await addUser(uid)
-	return uid
-}