diff --git a/server/api/friends.test.js b/server/api/friends.test.js
index 4134789..d57e662 100644
--- a/server/api/friends.test.js
+++ b/server/api/friends.test.js
@@ -3,8 +3,10 @@
 
 const http = require('http');
 const express = require('express');
+const rateLimit = require('express-rate-limit');
 
 const createFriendsRouter = require('./friends');
+const { apiRateLimitOptions } = require('../middlewares/apiRateLimit');
 
 const request = (server, {
   authenticated = true, body, method = 'GET', path = '/api/friends',
@@ -58,6 +60,7 @@ describe('friend REST routes', () => {
     };
     const app = express();
     app.use(express.json());
+    app.use(rateLimit(apiRateLimitOptions()));
     app.use((req, res, next) => {
       req.isAuthenticated = () => req.headers.authorization === 'test-session';
       if (req.isAuthenticated()) {
diff --git a/server/middlewares/csrf.test.js b/server/middlewares/csrf.test.js
index aa739da..5c36a42 100644
--- a/server/middlewares/csrf.test.js
+++ b/server/middlewares/csrf.test.js
@@ -8,7 +8,7 @@ const lusca = require('lusca');
 
 const request = (server, { cookie, headers, method = 'GET', path = '/' } = {}) => new Promise((resolve, reject) => {
   const req = http.request({
-    headers: { ...(cookie ? { cookie } : {}), ...headers },
+    headers: { 'x-forwarded-proto': 'https', ...(cookie ? { cookie } : {}), ...headers },
     host: '127.0.0.1',
     method,
     path,
@@ -19,6 +19,7 @@ const request = (server, { cookie, headers, method = 'GET', path = '/' } = {}) =
     res.on('end', () => resolve({
       body: body ? JSON.parse(body) : null,
       cookie: res.headers['set-cookie'] && res.headers['set-cookie'][0].split(';')[0],
+      setCookie: res.headers['set-cookie'] && res.headers['set-cookie'][0],
       status: res.statusCode,
     }));
   });
@@ -31,7 +32,17 @@ describe('CSRF protection', () => {
 
   beforeEach((done) => {
     const app = express();
-    app.use(session({ resave: false, saveUninitialized: false, secret: 'test-secret' }));
+    app.set('trust proxy', 1);
+    app.use(session({
+      cookie: {
+        httpOnly: true,
+        sameSite: 'strict',
+        secure: true,
+      },
+      resave: false,
+      saveUninitialized: false,
+      secret: 'test-secret',
+    }));
     app.use(lusca.csrf());
     app.get('/csrf-token', (req, res) => res.json({ csrfToken: req.csrfToken() }));
     app.post('/change', (req, res) => res.json({ changed: true }));
@@ -51,6 +62,7 @@ describe('CSRF protection', () => {
     expect(tokenResponse.status).toBe(200);
     expect(tokenResponse.body.csrfToken).toEqual(expect.any(String));
     expect(tokenResponse.cookie).toEqual(expect.stringContaining('connect.sid='));
+    expect(tokenResponse.setCookie).toEqual(expect.stringContaining('Secure'));
 
     expect(await request(server, {
       cookie: tokenResponse.cookie,