diff --git a/ts/components/session/ActionsPanel.tsx b/ts/components/session/ActionsPanel.tsx
index b2a44b8f70..6c32f113d9 100644
--- a/ts/components/session/ActionsPanel.tsx
+++ b/ts/components/session/ActionsPanel.tsx
@@ -245,7 +245,7 @@ const doAppStartUp = () => {
   debounce(triggerAvatarReUploadIfNeeded, 200);
 
   // TODO: Investigate the case where we reconnect
-  getSwarmPollingInstance().start();
+  void getSwarmPollingInstance().start();
 };
 
 /**
diff --git a/ts/data/data.ts b/ts/data/data.ts
index cb2826eea1..2613be494f 100644
--- a/ts/data/data.ts
+++ b/ts/data/data.ts
@@ -1,7 +1,7 @@
 import Electron from 'electron';
 
 const { ipcRenderer } = Electron;
-// tslint:disable: function-name no-require-imports no-var-requires one-variable-per-declaration no-void-expression
+// tslint:disable: no-require-imports no-var-requires one-variable-per-declaration no-void-expression
 
 import _ from 'lodash';
 import { ConversationCollection, ConversationModel } from '../models/conversation';
diff --git a/ts/session/messages/MessageController.ts b/ts/session/messages/MessageController.ts
index aaa7d37a18..c3e276abe1 100644
--- a/ts/session/messages/MessageController.ts
+++ b/ts/session/messages/MessageController.ts
@@ -69,7 +69,6 @@ export class MessageController {
     });
   }
 
-  // tslint:disable-next-line: function-name
   public get(identifier: string) {
     return this.messageLookup.get(identifier);
   }
diff --git a/ts/session/utils/AttachmentsDownload.ts b/ts/session/utils/AttachmentsDownload.ts
index 6ae23e6f8d..9df66264e5 100644
--- a/ts/session/utils/AttachmentsDownload.ts
+++ b/ts/session/utils/AttachmentsDownload.ts
@@ -90,7 +90,6 @@ export async function addJob(attachment: any, job: any = {}) {
   };
 }
 
-// tslint:disable: function-name
 async function _tick() {
   await _maybeStartJob();
   timeout = setTimeout(_tick, TICK_INTERVAL);
diff --git a/ts/util/blockedNumberController.ts b/ts/util/blockedNumberController.ts
index 281f79a8ce..d16399d5d8 100644
--- a/ts/util/blockedNumberController.ts
+++ b/ts/util/blockedNumberController.ts
@@ -1,4 +1,4 @@
-import { getItemById, createOrUpdateItem } from '../data/data';
+import { createOrUpdateItem, getItemById } from '../data/data';
 import { PubKey } from '../session/types';
 import { UserUtils } from '../session/utils';
 
diff --git a/tslint.json b/tslint.json
index 4f804d0152..79c9acaf19 100644
--- a/tslint.json
+++ b/tslint.json
@@ -65,10 +65,10 @@
     "function-name": [
       true,
       {
-        "function-regex": "^[a-z][\\w\\d]+$",
-        "method-regex": "^[a-z][\\w\\d]+$",
-        "private-method-regex": "^[a-z][\\w\\d]+$",
-        "protected-method-regex": "^[a-z][\\w\\d]+$",
+        "function-regex": "^(TEST_)?(_)?[a-z][\\w\\d]+$",
+        "method-regex": "^(TEST_)?(_)?[a-z][\\w\\d]+$",
+        "private-method-regex": "^(TEST_)?(_)?[a-z][\\w\\d]+$",
+        "protected-method-regex": "^(TEST_)?(_)?[a-z][\\w\\d]+$",
         "static-method-regex": "^[a-zA-Z][\\w\\d]+$"
       }
     ],