diff --git a/test/structures/test_timedcache.ts b/test/structures/test_timedcache.ts
index f002fc77ee182cb14f839c52a39f3228ce02ef67..0d39b5fb4d7fc580c971bd2cfc95f46bcc7ae413 100644
--- a/test/structures/test_timedcache.ts
+++ b/test/structures/test_timedcache.ts
@@ -117,7 +117,7 @@ describe("TimedCache", () => {
             }
             i++;
         }
-        await Util.DelayedPromise(LIVE_FOR);
+        await Util.DelayedPromise(LIVE_FOR * 5);
         const vals = [...timedCache.entries()];
         expect(vals).to.be.empty;
     });
diff --git a/test/test_matrixcommandhandler.ts b/test/test_matrixcommandhandler.ts
index 0d4124afec7a488d44312df661b727d77ca93965..9dc34cd85234f5506fb5055d79c9035cc0b26f0f 100644
--- a/test/test_matrixcommandhandler.ts
+++ b/test/test_matrixcommandhandler.ts
@@ -112,8 +112,9 @@ describe("MatrixCommandHandler", () => {
             bridge.botIntent.underlyingClient.wasCalled("sendMessage", true, "!123:localhost", {
                 body: "**ERROR:** The owner of this bridge does not permit self-service bridging.",
                 format: "org.matrix.custom.html",
-                formatted_body: `<p><strong>ERROR:</strong> The owner of this bridge
-does not permit self-service bridging.</p>\n`,
+                // tslint:disable prefer-template
+                formatted_body: `<p><strong>ERROR:</strong> The owner of this bridge` +
+` does not permit self-service bridging.</p>\n`,
                 msgtype: "m.notice",
             });
         });
@@ -122,8 +123,9 @@ does not permit self-service bridging.</p>\n`,
             await handler.Process(createEvent("!discord bridge"), createContext());
             const expected = "**ERROR:** insufficient permissions to use this " +
             "command! Try `!discord help` to see all available commands";
-            const htmlExpected = `<p><strong>ERROR:</strong> insufficient permissions to use this command!
-Try <code>!discord help</code> to see all available commands</p>\n`;
+            // tslint:disable prefer-template
+            const htmlExpected = `<p><strong>ERROR:</strong> insufficient permissions to use this command!` +
+` Try <code>!discord help</code> to see all available commands</p>\n`;
             bridge.botIntent.underlyingClient.wasCalled("sendMessage", true, "!123:localhost", {
                 body: expected,
                 format: "org.matrix.custom.html",
@@ -267,8 +269,9 @@ Try <code>!discord help</code> to see all available commands</p>\n`;
             it("will show error if unbridge fails", async () => {
                 const expected = "There was an error unbridging this room. Please " +
                 "try again later or contact the bridge operator.";
-                const expectedHtml = `<p>There was an error unbridging this room. Please
-try again later or contact the bridge operator.</p>\n`;
+                // tslint:disable prefer-template
+                const expectedHtml = `<p>There was an error unbridging this room. Please` +
+` try again later or contact the bridge operator.</p>\n`;
                 const {handler, bridge} = createCH({
                     failUnbridge: true,
                 });