diff --git a/packages/server/__snapshots__/2_cookies_spec.js b/packages/server/__snapshots__/2_cookies_spec.ts.js
similarity index 100%
rename from packages/server/__snapshots__/2_cookies_spec.js
rename to packages/server/__snapshots__/2_cookies_spec.ts.js
diff --git a/packages/server/__snapshots__/4_request_spec.js b/packages/server/__snapshots__/4_request_spec.ts.js
similarity index 100%
rename from packages/server/__snapshots__/4_request_spec.js
rename to packages/server/__snapshots__/4_request_spec.ts.js
diff --git a/packages/server/__snapshots__/5_subdomain_spec.js b/packages/server/__snapshots__/5_subdomain_spec.ts.js
similarity index 100%
rename from packages/server/__snapshots__/5_subdomain_spec.js
rename to packages/server/__snapshots__/5_subdomain_spec.ts.js
diff --git a/packages/server/test/e2e/2_cookies_spec.js b/packages/server/test/e2e/2_cookies_spec.ts
similarity index 97%
rename from packages/server/test/e2e/2_cookies_spec.js
rename to packages/server/test/e2e/2_cookies_spec.ts
index 657e0f877f13..83a10d35886e 100644
--- a/packages/server/test/e2e/2_cookies_spec.js
+++ b/packages/server/test/e2e/2_cookies_spec.ts
@@ -1,7 +1,7 @@
-const moment = require('moment')
-const parser = require('cookie-parser')
-const e2e = require('../support/helpers/e2e').default
-const humanInterval = require('human-interval')
+import moment from 'moment'
+import parser from 'cookie-parser'
+import e2e from '../support/helpers/e2e'
+import humanInterval from 'human-interval'
 
 const onServer = function (app) {
   app.use(parser())
diff --git a/packages/server/test/e2e/4_request_spec.js b/packages/server/test/e2e/4_request_spec.ts
similarity index 96%
rename from packages/server/test/e2e/4_request_spec.js
rename to packages/server/test/e2e/4_request_spec.ts
index fa33ab6e6105..e857488bcacf 100644
--- a/packages/server/test/e2e/4_request_spec.js
+++ b/packages/server/test/e2e/4_request_spec.ts
@@ -1,6 +1,6 @@
-const bodyParser = require('body-parser')
-const cookieParser = require('cookie-parser')
-const e2e = require('../support/helpers/e2e').default
+import bodyParser from 'body-parser'
+import cookieParser from 'cookie-parser'
+import e2e from '../support/helpers/e2e'
 
 let counts = null
 
diff --git a/packages/server/test/e2e/5_subdomain_spec.js b/packages/server/test/e2e/5_subdomain_spec.ts
similarity index 93%
rename from packages/server/test/e2e/5_subdomain_spec.js
rename to packages/server/test/e2e/5_subdomain_spec.ts
index ebcf82fb2109..568330b5a5b2 100644
--- a/packages/server/test/e2e/5_subdomain_spec.js
+++ b/packages/server/test/e2e/5_subdomain_spec.ts
@@ -1,7 +1,7 @@
-const cors = require('cors')
-const parser = require('cookie-parser')
-const session = require('express-session')
-const e2e = require('../support/helpers/e2e').default
+import cors from 'cors'
+import parser from 'cookie-parser'
+import session from 'express-session'
+import e2e from '../support/helpers/e2e'
 
 const onServer = function (app) {
   app.use(parser())
@@ -48,7 +48,7 @@ const onServer = function (app) {
     cookie: {
       sameSite: true,
     },
-  })
+  }) as Function
 
   app.get('/htmlCookies', (req, res) => {
     const {
diff --git a/packages/server/test/support/fixtures/projects/e2e/cypress/integration/cookies_spec_no_baseurl.coffee b/packages/server/test/support/fixtures/projects/e2e/cypress/integration/cookies_spec_no_baseurl.coffee
index ebe46a3cd9a9..da67c7e98ef6 100644
--- a/packages/server/test/support/fixtures/projects/e2e/cypress/integration/cookies_spec_no_baseurl.coffee
+++ b/packages/server/test/support/fixtures/projects/e2e/cypress/integration/cookies_spec_no_baseurl.coffee
@@ -24,7 +24,7 @@ describe "cookies", ->
           expect(c.expiry).to.be.a("number")
 
           expect(c).to.have.keys(
-            "domain", "name", "value", "path", "secure", "httpOnly", "expiry"
+            "domain", "name", "value", "path", "sameSite", "secure", "httpOnly", "expiry"
           )
         .getCookies()
           .should("have.length", 1)
@@ -40,7 +40,7 @@ describe "cookies", ->
             expect(c.expiry).to.be.a("number")
 
             expect(c).to.have.keys(
-              "domain", "name", "value", "path", "secure", "httpOnly", "expiry"
+              "domain", "name", "value", "path", "sameSite", "secure", "httpOnly", "expiry"
             )
         .clearCookies()
           .should("be.null")
@@ -55,7 +55,7 @@ describe "cookies", ->
           expect(c.expiry).to.be.a("number")
 
           expect(c).to.have.keys(
-            "domain", "name", "value", "path", "secure", "httpOnly", "expiry"
+            "domain", "name", "value", "path", "sameSite", "secure", "httpOnly", "expiry"
           )
         .clearCookie("wtf")
           .should("be.null")
diff --git a/packages/server/test/support/fixtures/projects/e2e/cypress/integration/request_spec.coffee b/packages/server/test/support/fixtures/projects/e2e/cypress/integration/request_spec.coffee
index d59ea40bab53..5b96e92d988c 100644
--- a/packages/server/test/support/fixtures/projects/e2e/cypress/integration/request_spec.coffee
+++ b/packages/server/test/support/fixtures/projects/e2e/cypress/integration/request_spec.coffee
@@ -20,14 +20,14 @@ describe "redirects + requests", ->
         expect(cookies[0].secure).to.eq(false)
         expect(cookies[0].expiry).to.be.closeTo(oneMinuteFromNow, 5)
 
-        expect(cookies[1]).to.deep.eq({
+        expect(cookies[1]).to.deep.eq(Cypress._.merge({
           domain: "localhost"
           name: "2293-session"
           value: "true"
           httpOnly: false
           path: "/"
           secure: false
-        })
+        }, (if Cypress.isBrowser('firefox') then { sameSite: 'no_restriction' } else {})))
 
   it "visits to a different superdomain will be resolved twice", ->
     cy
diff --git a/packages/server/test/support/fixtures/projects/e2e/cypress/integration/subdomain_spec.coffee b/packages/server/test/support/fixtures/projects/e2e/cypress/integration/subdomain_spec.coffee
index 08d712e80cd3..6af1d6a2b348 100644
--- a/packages/server/test/support/fixtures/projects/e2e/cypress/integration/subdomain_spec.coffee
+++ b/packages/server/test/support/fixtures/projects/e2e/cypress/integration/subdomain_spec.coffee
@@ -42,7 +42,7 @@ describe "subdomains", ->
     cy
       .visit("http://domain.foobar.com:2292")
       .getCookies().should("have.length", 1)
-      .getCookie("nomnom").should("deep.eq", {
+      .getCookie("nomnom").should("include", {
         domain: ".foobar.com"
         name: "nomnom"
         value: "good"