diff --git a/website/cypress/e2e/create/assistant_reply.cy.ts b/website/cypress/e2e/create/assistant_reply.cy.ts
deleted file mode 100644
index aa72b846..00000000
--- a/website/cypress/e2e/create/assistant_reply.cy.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { faker } from "@faker-js/faker";
-
-describe("replying as the assistant", () => {
-  it("completes the current task on submit and on request shows a new task", () => {
-    cy.signInWithEmail("cypress@example.com");
-    cy.visit("/create/assistant_reply");
-
-    cy.get('[data-cy="task-id"').then((taskIdElement) => {
-      const taskId = taskIdElement.text();
-
-      const reply = faker.lorem.sentence();
-      cy.log("reply", reply);
-      cy.get('[data-cy="reply"').type(reply);
-
-      cy.get('[data-cy="submit"]').click();
-
-      cy.get('[data-cy="next-task"]').click();
-
-      cy.get('[data-cy="task-id"').should((taskIdElement) => {
-        expect(taskIdElement.text()).not.to.eq(taskId);
-      });
-    });
-  });
-});
-
-export {};
diff --git a/website/cypress/e2e/create/initial_prompt.cy.ts b/website/cypress/e2e/create/initial_prompt.cy.ts
deleted file mode 100644
index b17f2dd9..00000000
--- a/website/cypress/e2e/create/initial_prompt.cy.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { faker } from "@faker-js/faker";
-
-describe("creating initial prompts", () => {
-  it("completes the current task on submit and on request shows a new task", () => {
-    cy.signInWithEmail("cypress@example.com");
-    cy.visit("/create/initial_prompt");
-
-    cy.get('[data-cy="task-id"').then((taskIdElement) => {
-      const taskId = taskIdElement.text();
-
-      const prompt = faker.lorem.sentence();
-      cy.log("prompt", prompt);
-      cy.get('[data-cy="reply"').type(prompt);
-
-      cy.get('[data-cy="submit"]').click();
-
-      cy.get('[data-cy="next-task"]').click();
-
-      cy.get('[data-cy="task-id"').should((taskIdElement) => {
-        expect(taskIdElement.text()).not.to.eq(taskId);
-      });
-    });
-  });
-});
-
-export {};
diff --git a/website/cypress/e2e/create/user_reply.cy.ts b/website/cypress/e2e/create/user_reply.cy.ts
deleted file mode 100644
index c126e9c5..00000000
--- a/website/cypress/e2e/create/user_reply.cy.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { faker } from "@faker-js/faker";
-
-describe("replying as the prompter", () => {
-  it("completes the current task on submit and on request shows a new task", () => {
-    cy.signInWithEmail("cypress@example.com");
-    cy.visit("/create/user_reply");
-
-    cy.get('[data-cy="task-id"').then((taskIdElement) => {
-      const taskId = taskIdElement.text();
-
-      const reply = faker.lorem.sentence();
-      cy.log("reply", reply);
-      cy.get('[data-cy="reply"').type(reply);
-
-      cy.get('[data-cy="submit"]').click();
-
-      cy.get('[data-cy="next-task"]').click();
-
-      cy.get('[data-cy="task-id"').should((taskIdElement) => {
-        expect(taskIdElement.text()).not.to.eq(taskId);
-      });
-    });
-  });
-});
-
-export {};
diff --git a/website/cypress/e2e/evaluate/rank_assistant_replies.cy.ts b/website/cypress/e2e/evaluate/rank_assistant_replies.cy.ts
deleted file mode 100644
index 3093bd56..00000000
--- a/website/cypress/e2e/evaluate/rank_assistant_replies.cy.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-describe("ranking prompter replies", () => {
-  it("completes the current task on submit and on request shows a new task", () => {
-    cy.signInWithEmail("cypress@example.com");
-    cy.visit("/evaluate/rank_assistant_replies");
-
-    cy.get('[data-cy="task-id"').then((taskIdElement) => {
-      const taskId = taskIdElement.text();
-
-      // Rank an item using the keyboard so that the submit button is enabled
-      cy.get('button[aria-roledescription="sortable"]')
-        .first()
-        .click()
-        .type("{enter}")
-        .wait(100)
-        .type("{downArrow}")
-        .wait(100)
-        .type("{enter}");
-
-      cy.get('[data-cy="submit"]').click();
-
-      cy.get('[data-cy="next-task"]').click();
-
-      cy.get('[data-cy="task-id"').should((taskIdElement) => {
-        expect(taskIdElement.text()).not.to.eq(taskId);
-      });
-    });
-  });
-});
-
-export {};
diff --git a/website/cypress/e2e/evaluate/rank_initial_prompts.cy.ts b/website/cypress/e2e/evaluate/rank_initial_prompts.cy.ts
deleted file mode 100644
index 8c3f4c9a..00000000
--- a/website/cypress/e2e/evaluate/rank_initial_prompts.cy.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-describe("ranking initial prompts", () => {
-  it("completes the current task on submit and on request shows a new task", () => {
-    cy.signInWithEmail("cypress@example.com");
-    cy.visit("/evaluate/rank_initial_prompts");
-
-    cy.get('[data-cy="task-id"').then((taskIdElement) => {
-      const taskId = taskIdElement.text();
-
-      // Rank an item using the keyboard so that the submit button is enabled
-      cy.get('button[aria-roledescription="sortable"]')
-        .first()
-        .click()
-        .type("{enter}")
-        .wait(100)
-        .type("{downArrow}")
-        .wait(100)
-        .type("{enter}");
-
-      cy.get('[data-cy="submit"]').click();
-
-      cy.get('[data-cy="next-task"]').click();
-
-      cy.get('[data-cy="task-id"').should((taskIdElement) => {
-        expect(taskIdElement.text()).not.to.eq(taskId);
-      });
-    });
-  });
-});
-
-export {};
diff --git a/website/cypress/e2e/evaluate/rank_user_replies.cy.ts b/website/cypress/e2e/evaluate/rank_user_replies.cy.ts
deleted file mode 100644
index 55487f1d..00000000
--- a/website/cypress/e2e/evaluate/rank_user_replies.cy.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-describe("ranking assistant replies", () => {
-  it("completes the current task on submit and on request shows a new task", () => {
-    cy.signInWithEmail("cypress@example.com");
-    cy.visit("/evaluate/rank_user_replies");
-
-    cy.get('[data-cy="task-id"').then((taskIdElement) => {
-      const taskId = taskIdElement.text();
-
-      // Rank an item using the keyboard so that the submit button is enabled
-      cy.get('button[aria-roledescription="sortable"]')
-        .first()
-        .click()
-        .type("{enter}")
-        .wait(100)
-        .type("{downArrow}")
-        .wait(100)
-        .type("{enter}");
-
-      cy.get('[data-cy="submit"]').click();
-
-      cy.get('[data-cy="next-task"]').click();
-
-      cy.get('[data-cy="task-id"').should((taskIdElement) => {
-        expect(taskIdElement.text()).not.to.eq(taskId);
-      });
-    });
-  });
-});
-
-export {};
diff --git a/website/src/components/Tasks/CreateTask.tsx b/website/src/components/Tasks/CreateTask.tsx
index 84b9fe3f..d5f38ad1 100644
--- a/website/src/components/Tasks/CreateTask.tsx
+++ b/website/src/components/Tasks/CreateTask.tsx
@@ -14,21 +14,23 @@ export const CreateTask = ({ task, taskType, onReplyChanged }: TaskSurveyProps<{
   };
 
   return (
-    <TwoColumnsWithCards>
-      <>
-        <h5 className="text-lg font-semibold">{taskType.label}</h5>
-        <p className="text-lg py-1">{taskType.overview}</p>
-        {task.conversation ? <Messages messages={task.conversation.messages} post_id={task.id} /> : null}
-      </>
-      <>
-        <h5 className="text-lg font-semibold">{taskType.instruction}</h5>
-        <TrackedTextarea
-          text={inputText}
-          onTextChange={textChangeHandler}
-          thresholds={{ low: 20, medium: 40, goal: 50 }}
-          textareaProps={{ placeholder: "Reply..." }}
-        />
-      </>
-    </TwoColumnsWithCards>
+    <div data-cy="task" data-task-type="create-task">
+      <TwoColumnsWithCards>
+        <>
+          <h5 className="text-lg font-semibold">{taskType.label}</h5>
+          <p className="text-lg py-1">{taskType.overview}</p>
+          {task.conversation ? <Messages messages={task.conversation.messages} post_id={task.id} /> : null}
+        </>
+        <>
+          <h5 className="text-lg font-semibold">{taskType.instruction}</h5>
+          <TrackedTextarea
+            text={inputText}
+            onTextChange={textChangeHandler}
+            thresholds={{ low: 20, medium: 40, goal: 50 }}
+            textareaProps={{ placeholder: "Reply..." }}
+          />
+        </>
+      </TwoColumnsWithCards>
+    </div>
   );
 };
diff --git a/website/src/components/Tasks/EvaluateTask.tsx b/website/src/components/Tasks/EvaluateTask.tsx
index 54abfbf6..c6c5d5e6 100644
--- a/website/src/components/Tasks/EvaluateTask.tsx
+++ b/website/src/components/Tasks/EvaluateTask.tsx
@@ -27,13 +27,15 @@ export const EvaluateTask = ({ task, onReplyChanged }: TaskSurveyProps<{ ranking
   const sortables = task.replies ? "replies" : "prompts";
 
   return (
-    <SurveyCard className="max-w-7xl mx-auto h-fit mb-24">
-      <h5 className="text-lg font-semibold mb-4">Instructions</h5>
-      <p className="text-lg py-1">
-        Given the following {sortables}, sort them from best to worst, best being first, worst being last.
-      </p>
-      <MessageTable messages={messages} />
-      <Sortable items={task[sortables]} onChange={onRank} className="my-8" />
-    </SurveyCard>
+    <div data-cy="task" data-task-type="evaluate-task">
+      <SurveyCard className="max-w-7xl mx-auto h-fit mb-24">
+        <h5 className="text-lg font-semibold mb-4">Instructions</h5>
+        <p className="text-lg py-1">
+          Given the following {sortables}, sort them from best to worst, best being first, worst being last.
+        </p>
+        <MessageTable messages={messages} />
+        <Sortable items={task[sortables]} onChange={onRank} className="my-8" />
+      </SurveyCard>
+    </div>
   );
 };
diff --git a/website/src/components/Tasks/LabelTask.tsx b/website/src/components/Tasks/LabelTask.tsx
index db7c0641..36b6cb16 100644
--- a/website/src/components/Tasks/LabelTask.tsx
+++ b/website/src/components/Tasks/LabelTask.tsx
@@ -31,28 +31,30 @@ export const LabelTask = ({
   };
 
   return (
-    <TwoColumnsWithCards>
-      <>
-        <h5 className="text-lg font-semibold">{taskType.label}</h5>
-        <p className="text-lg py-1">{taskType.overview}</p>
+    <div data-cy="task" data-task-type="label-task">
+      <TwoColumnsWithCards>
+        <>
+          <h5 className="text-lg font-semibold">{taskType.label}</h5>
+          <p className="text-lg py-1">{taskType.overview}</p>
 
-        {task.conversation ? (
-          <MessageTable
-            messages={[
-              ...(task.conversation ? task.conversation.messages : []),
-              {
-                text: task.reply,
-                is_assistant: task.type === TaskType.label_assistant_reply,
-                message_id: task.message_id,
-              },
-            ]}
-          />
-        ) : (
-          <MessageView text={task.prompt} is_assistant={false} message_id={task.message_id} />
-        )}
-      </>
-      <LabelSliderGroup labelIDs={task.valid_labels} onChange={onSliderChange} />
-    </TwoColumnsWithCards>
+          {task.conversation ? (
+            <MessageTable
+              messages={[
+                ...(task.conversation ? task.conversation.messages : []),
+                {
+                  text: task.reply,
+                  is_assistant: task.type === TaskType.label_assistant_reply,
+                  message_id: task.message_id,
+                },
+              ]}
+            />
+          ) : (
+            <MessageView text={task.prompt} is_assistant={false} message_id={task.message_id} />
+          )}
+        </>
+        <LabelSliderGroup labelIDs={task.valid_labels} onChange={onSliderChange} />
+      </TwoColumnsWithCards>
+    </div>
   );
 };