diff --git a/apps/web/playwright/app-store.e2e.ts b/apps/web/playwright/app-store.e2e.ts
index 464e9e9e6d..e8c82ac367 100644
--- a/apps/web/playwright/app-store.e2e.ts
+++ b/apps/web/playwright/app-store.e2e.ts
@@ -8,8 +8,7 @@ test.describe("App Store - Authed", () => {
   test("Browse apple-calendar and try to install", async ({ page, users }) => {
     const pro = await users.create();
     await pro.login();
-    await page.goto("/apps");
-    await page.click('[data-testid="app-store-category-calendar"]');
+    await page.goto("/apps/categories/calendar");
     await page.click('[data-testid="app-store-app-card-apple-calendar"]');
     await page.click('[data-testid="install-app-button"]');
     await expect(page.locator(`text=Connect to Apple Server`)).toBeVisible();
@@ -19,9 +18,7 @@ test.describe("App Store - Authed", () => {
 
 test.describe("App Store - Unauthed", () => {
   test("Browse apple-calendar and try to install", async ({ page }) => {
-    await page.goto("/apps");
-    await page.waitForSelector("[data-testid=dashboard-shell]");
-    await page.click('[data-testid="app-store-category-calendar"]');
+    await page.goto("/apps/categories/calendar");
     await page.click('[data-testid="app-store-app-card-apple-calendar"]');
     await page.click('[data-testid="install-app-button"]');
     await expect(page.locator(`[data-testid="login-form"]`)).toBeVisible();
diff --git a/packages/ui/v2/core/apps/AppCard.tsx b/packages/ui/v2/core/apps/AppCard.tsx
index 46b53123e0..2bae43f4ff 100644
--- a/packages/ui/v2/core/apps/AppCard.tsx
+++ b/packages/ui/v2/core/apps/AppCard.tsx
@@ -30,9 +30,7 @@ export default function AppCard({ app, credentials }: AppCardProps) {
   const appAdded = (credentials && credentials.length) || 0;
 
   return (
-    <div
-      className="relative flex h-64 flex-col rounded-md border border-gray-300 p-5"
-      data-testid={`app-store-app-card-${app.slug}`}>
+    <div className="relative flex h-64 flex-col rounded-md border border-gray-300 p-5">
       <div className="flex">
         <img src={app.logo} alt={app.name + " Logo"} className="mb-4 h-12 w-12 rounded-sm" />
       </div>
@@ -54,7 +52,11 @@ export default function AppCard({ app, credentials }: AppCardProps) {
         {app.description}
       </p>
       <div className="mt-5 flex max-w-full flex-row flex-wrap justify-between gap-2">
-        <Button color="secondary" className="flex w-32 flex-grow justify-center" href={"/apps/" + app.slug}>
+        <Button
+          color="secondary"
+          className="flex w-32 flex-grow justify-center"
+          href={`/apps/${app.slug}`}
+          data-testid={`app-store-app-card-${app.slug}`}>
           {t("details")}
         </Button>
         {app.isGlobal || (credentials && credentials.length > 0 && allowedMultipleInstalls)