diff --git a/src/pages/admin/events/[id].tsx b/src/pages/admin/events/[id].tsx
index 1c542e9..9e51ea9 100644
--- a/src/pages/admin/events/[id].tsx
+++ b/src/pages/admin/events/[id].tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { NextPage, GetServerSideProps } from "next";
+import { NextPage } from "next";
 import Head from "next/head";
 import { useRouter } from "next/router";
 import AdminCreateCommon from "@views/admin/AdminCreateCommon";
@@ -257,6 +257,4 @@ const EventCreatePage: NextPage = () => {
   );
 };
 
-export const getServerSideProps: GetServerSideProps = async () => ({ props: {} });
-
 export default EventCreatePage;
diff --git a/src/pages/admin/events/index.tsx b/src/pages/admin/events/index.tsx
index 8c4a793..2eaa288 100644
--- a/src/pages/admin/events/index.tsx
+++ b/src/pages/admin/events/index.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { NextPage, GetServerSideProps } from "next";
+import { NextPage } from "next";
 import Head from "next/head";
 import { formatRelative } from "date-fns";
 import AdminListCommon from "@views/admin/AdminListCommon";
@@ -57,6 +57,4 @@ const AdminEventPage: NextPage = () => {
   );
 };
 
-export const getServerSideProps: GetServerSideProps = async () => ({ props: {} });
-
 export default AdminEventPage;
diff --git a/src/pages/admin/feed/[id].tsx b/src/pages/admin/feed/[id].tsx
index 4efdddb..a6704d7 100644
--- a/src/pages/admin/feed/[id].tsx
+++ b/src/pages/admin/feed/[id].tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { NextPage, GetServerSideProps } from "next";
+import { NextPage } from "next";
 import Head from "next/head";
 import { useRouter } from "next/router";
 import AdminCreateCommon from "@views/admin/AdminCreateCommon";
@@ -209,6 +209,4 @@ const FeedCreatePage: NextPage = () => {
   );
 };
 
-export const getServerSideProps: GetServerSideProps = async () => ({ props: {} });
-
 export default FeedCreatePage;
diff --git a/src/pages/admin/feed/index.tsx b/src/pages/admin/feed/index.tsx
index 03f79c4..c52d306 100644
--- a/src/pages/admin/feed/index.tsx
+++ b/src/pages/admin/feed/index.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { NextPage, GetServerSideProps } from "next";
+import { NextPage } from "next";
 import Head from "next/head";
 import { formatRelative } from "date-fns";
 import AdminListCommon from "@views/admin/AdminListCommon";
@@ -58,6 +58,4 @@ const AdminFeedPage: NextPage = () => {
   );
 };
 
-export const getServerSideProps: GetServerSideProps = async () => ({ props: {} });
-
 export default AdminFeedPage;
diff --git a/src/pages/admin/index.tsx b/src/pages/admin/index.tsx
index 6c100e7..6fc3cf3 100644
--- a/src/pages/admin/index.tsx
+++ b/src/pages/admin/index.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { NextPage, GetServerSideProps } from "next";
+import { NextPage } from "next";
 import Head from "next/head";
 import AdminPageWrapper from "@views/common/AdminPageWrapper";
 
@@ -17,5 +17,3 @@ const AdminFrontPage: NextPage = () => (
 );
 
 export default AdminFrontPage;
-
-export const getServerSideProps: GetServerSideProps = async () => ({ props: {} });
diff --git a/src/pages/admin/jobads/[id].tsx b/src/pages/admin/jobads/[id].tsx
index 1ef10d3..8406dbf 100644
--- a/src/pages/admin/jobads/[id].tsx
+++ b/src/pages/admin/jobads/[id].tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { NextPage, GetServerSideProps } from "next";
+import { NextPage } from "next";
 import Head from "next/head";
 import { useRouter } from "next/router";
 import AdminCreateCommon from "@views/admin/AdminCreateCommon";
@@ -174,6 +174,4 @@ const JobAdCreatePage: NextPage = () => {
   );
 };
 
-export const getServerSideProps: GetServerSideProps = async () => ({ props: {} });
-
 export default JobAdCreatePage;
diff --git a/src/pages/admin/jobads/index.tsx b/src/pages/admin/jobads/index.tsx
index 6cbf3b7..356497a 100644
--- a/src/pages/admin/jobads/index.tsx
+++ b/src/pages/admin/jobads/index.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { NextPage, GetServerSideProps } from "next";
+import { NextPage } from "next";
 import Head from "next/head";
 import { formatRelative } from "date-fns";
 import AdminListCommon from "@views/admin/AdminListCommon";
@@ -62,6 +62,4 @@ const AdminJobAdPage: NextPage = () => {
   );
 };
 
-export const getServerSideProps: GetServerSideProps = async () => ({ props: {} });
-
 export default AdminJobAdPage;
diff --git a/src/pages/admin/login.tsx b/src/pages/admin/login.tsx
index 346c2dc..48e3be0 100644
--- a/src/pages/admin/login.tsx
+++ b/src/pages/admin/login.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from "react";
-import { NextPage, GetServerSideProps } from "next";
+import { NextPage } from "next";
 import Head from "next/head";
 import { useRouter } from "next/router";
 import styled from "styled-components";
@@ -86,6 +86,4 @@ const AdminLoginPage: NextPage = () => {
   );
 };
 
-export const getServerSideProps: GetServerSideProps = async () => ({ props: {} });
-
 export default AdminLoginPage;
diff --git a/src/pages/admin/signups/[id].tsx b/src/pages/admin/signups/[id].tsx
index f3e6dfa..bb5d895 100644
--- a/src/pages/admin/signups/[id].tsx
+++ b/src/pages/admin/signups/[id].tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { NextPage, GetServerSideProps } from "next";
+import { NextPage } from "next";
 import Head from "next/head";
 import { useRouter } from "next/router";
 import AdminCreateCommon from "@views/admin/AdminCreateCommon";
@@ -184,6 +184,4 @@ const SignupCreatePage: NextPage = () => {
   );
 };
 
-export const getServerSideProps: GetServerSideProps = async () => ({ props: {} });
-
 export default SignupCreatePage;
diff --git a/src/pages/admin/signups/[id]/email.tsx b/src/pages/admin/signups/[id]/email.tsx
index 71c4ab1..d16a1c0 100644
--- a/src/pages/admin/signups/[id]/email.tsx
+++ b/src/pages/admin/signups/[id]/email.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { NextPage, GetServerSideProps } from "next";
+import { NextPage } from "next";
 import { useRouter } from "next/router";
 import AdminCreateCommon from "@views/admin/AdminCreateCommon";
 import MarkdownEditorWidget from "@components/Widgets/MarkdownEditorWidget";
@@ -91,6 +91,4 @@ const SignupEmailPage: NextPage = () => {
   );
 };
 
-export const getServerSideProps: GetServerSideProps = async () => ({ props: {} });
-
 export default SignupEmailPage;
diff --git a/src/pages/admin/signups/[id]/list.tsx b/src/pages/admin/signups/[id]/list.tsx
index aed4934..a9713ff 100644
--- a/src/pages/admin/signups/[id]/list.tsx
+++ b/src/pages/admin/signups/[id]/list.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { NextPage, GetServerSideProps } from "next";
+import { NextPage } from "next";
 import { useRouter } from "next/router";
 import styled from "styled-components";
 import { CSVLink } from "react-csv";
@@ -93,6 +93,4 @@ const SignupEmailPage: NextPage = () => {
   );
 };
 
-export const getServerSideProps: GetServerSideProps = async () => ({ props: {} });
-
 export default SignupEmailPage;
diff --git a/src/pages/admin/signups/index.tsx b/src/pages/admin/signups/index.tsx
index 84b5f76..04e72eb 100644
--- a/src/pages/admin/signups/index.tsx
+++ b/src/pages/admin/signups/index.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from "react";
-import { NextPage, GetServerSideProps } from "next";
+import { NextPage } from "next";
 import Head from "next/head";
 import { formatRelative } from "date-fns";
 import AdminListCommon from "@views/admin/AdminListCommon";
@@ -62,6 +62,4 @@ const AdminSignupPage: NextPage = () => {
   );
 };
 
-export const getServerSideProps: GetServerSideProps = async () => ({ props: {} });
-
 export default AdminSignupPage;
diff --git a/tests/testcafe/signupToEvent.test.ts b/tests/testcafe/signupToEvent.test.ts
index c8fc25a..4704e4f 100644
--- a/tests/testcafe/signupToEvent.test.ts
+++ b/tests/testcafe/signupToEvent.test.ts
@@ -18,8 +18,6 @@ fixture`Event signup`.page(getSiteRoot())
   });
 
 test("User signups to event from front page", async (t) => {
-  // Wait 60s, so server has revalidated & rebuilt itself
-  await t.wait(60000);
   const CardSelector = Selector("[data-e2e=\"event-card\"]").withText("title_fi").nth(0);
 
   await t
diff --git a/tests/testcafe/utils.ts b/tests/testcafe/utils.ts
index 8b0a9ba..a64411f 100644
--- a/tests/testcafe/utils.ts
+++ b/tests/testcafe/utils.ts
@@ -154,3 +154,6 @@ export const generateTestEvent = async (formIds = [], jwt: string) => (
     tag_id: [1],
   }, jwt)
 );
+
+export const sleep = async (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
+export const reloadPage = (t?: TestController) => ClientFunction(() => window.location.reload(), { boundTestRun: t });