diff --git a/package.json b/package.json
index c5392d32b0..7f2f4d6a47 100644
--- a/package.json
+++ b/package.json
@@ -124,6 +124,7 @@
     "@babel/register": "^7.12.10",
     "@babel/traverse": "^7.12.12",
     "@peculiar/webcrypto": "^1.1.4",
+    "@sinonjs/fake-timers": "^7.0.2",
     "@types/classnames": "^2.2.11",
     "@types/counterpart": "^0.18.1",
     "@types/flux": "^3.1.9",
@@ -157,7 +158,6 @@
     "jest": "^26.6.3",
     "jest-canvas-mock": "^2.3.0",
     "jest-environment-jsdom-sixteen": "^1.0.3",
-    "lolex": "^6.0.0",
     "matrix-mock-request": "^1.2.3",
     "matrix-react-test-utils": "^0.2.2",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz",
diff --git a/test/UserActivity-test.js b/test/UserActivity-test.js
index 51fb720bce..2c622b2638 100644
--- a/test/UserActivity-test.js
+++ b/test/UserActivity-test.js
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 New Vector Ltd
+Copyright 2019, 2021 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import lolex from 'lolex';
+import FakeTimers from '@sinonjs/fake-timers';
 import EventEmitter from 'events';
 import UserActivity from '../src/UserActivity';
 
@@ -39,7 +39,7 @@ describe('UserActivity', function() {
         fakeDocument = new FakeDomEventEmitter();
         userActivity = new UserActivity(fakeWindow, fakeDocument);
         userActivity.start();
-        clock = lolex.install();
+        clock = FakeTimers.install();
     });
 
     afterEach(function() {
diff --git a/yarn.lock b/yarn.lock
index 9cba2b531f..83cbafb882 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1798,6 +1798,13 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
+"@sinonjs/fake-timers@^7.0.2":
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.0.2.tgz#a53e71d4154ee704ea9b36a6d0b0780e246fadd1"
+  integrity sha512-dF84L5YC90gIOegPDCYymPIsDmwMWWSh7BwfDXQYePi8lVIEp7IZ1UVGkME8FjXOsDPxan12x4aaK+Lo6wVh9A==
+  dependencies:
+    "@sinonjs/commons" "^1.7.0"
+
 "@stylelint/postcss-css-in-js@^0.37.2":
   version "0.37.2"
   resolved "https://registry.yarnpkg.com/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz#7e5a84ad181f4234a2480803422a47b8749af3d2"
@@ -6243,13 +6250,6 @@ lolex@^5.0.0:
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-lolex@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lolex/-/lolex-6.0.0.tgz#790de1911da46e67e4b60c94859d19e2db0bb7e9"
-  integrity sha512-ad9IBHbfVJ3bPAotDxnCgJgKcNK5/mrRAfbJzXhY5+PEmuBWP7wyHQlA6L8TfSfPlqlDjY4K7IG6mbzsrIBx1A==
-  dependencies:
-    "@sinonjs/commons" "^1.7.0"
-
 longest-streak@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4"